diff --git a/.travis.yml b/.travis.yml
index 29616dc..06aa4c9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,10 +4,14 @@ language: bash
 sudo: 9000
 
 env:
-  - VERSION=8.1
-  - VERSION=8.0
-  - VERSION=7.0
-  - VERSION=6.0
+  - VERSION=8.1 VARIANT=fpm
+  - VERSION=8.1 VARIANT=apache
+  - VERSION=8.0 VARIANT=fpm
+  - VERSION=8.0 VARIANT=apache
+  - VERSION=7.0 VARIANT=fpm
+  - VERSION=7.0 VARIANT=apache
+  - VERSION=6.0 VARIANT=fpm
+  - VERSION=6.0 VARIANT=apache
 
 install:
   - git clone https://github.com/docker-library/official-images.git ~/official-images
@@ -15,10 +19,10 @@ install:
 before_script:
   - env | sort
   - cd "$VERSION"
-  - image="owncloud:$VERSION"
+  - image="owncloud:${VERSION}${VARIANT:+-$VARIANT}"
 
 script:
-  - docker build -t "$image" .
+  - docker build -t "$image" "${VARIANT}"
   - ~/official-images/test/run.sh "$image"
 
 after_script:
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 4788990..1b7681b 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -17,18 +17,27 @@ url='git://github.com/docker-library/owncloud'
 echo '# maintainer: InfoSiftr <github@infosiftr.com> (@infosiftr)'
 
 for version in "${versions[@]}"; do
-	commit="$(cd "$version" && git log -1 --format='format:%H' -- Dockerfile $(awk 'toupper($1) == "COPY" { for (i = 2; i < NF; i++) { print $i } }' Dockerfile))"
-	fullVersion="$(grep -m1 'ENV OWNCLOUD_VERSION ' "$version/Dockerfile" | cut -d' ' -f3)"
-	
-	versionAliases=()
-	while [ "$fullVersion" != "$version" -a "${fullVersion%[.-]*}" != "$fullVersion" ]; do
-		versionAliases+=( $fullVersion )
-		fullVersion="${fullVersion%[.-]*}"
-	done
-	versionAliases+=( $version ${aliases[$version]} )
-	
-	echo
-	for va in "${versionAliases[@]}"; do
-		echo "$va: ${url}@${commit} $version"
+	for variant in apache fpm; do
+		commit="$(cd "$version/$variant" && git log -1 --format='format:%H' -- Dockerfile $(awk 'toupper($1) == "COPY" { for (i = 2; i < NF; i++) { print $i } }' Dockerfile))"
+		fullVersion="$(grep -m1 'ENV OWNCLOUD_VERSION ' "$version/$variant/Dockerfile" | cut -d' ' -f3)"
+
+		versionAliases=()
+		while [ "$fullVersion" != "$version" -a "${fullVersion%[.-]*}" != "$fullVersion" ]; do
+			versionAliases+=( $fullVersion )
+			fullVersion="${fullVersion%[.-]*}"
+		done
+		versionAliases+=( $version ${aliases[$version]} )
+
+		echo
+		for va in "${versionAliases[@]}"; do
+			echo "$va-$variant: ${url}@${commit} $version/$variant"
+			if [ "${variant}" == "apache" ]; then
+				echo "$va: ${url}@${commit} $version/$variant"
+			else
+				if [ "$va" == "latest" ]; then
+					echo "$variant: ${url}@${commit} $version/$variant"
+				fi
+			fi
+		done
 	done
 done
diff --git a/update.sh b/update.sh
index 086459e..42656cc 100755
--- a/update.sh
+++ b/update.sh
@@ -13,9 +13,10 @@ versions=( "${versions[@]%/}" )
 travisEnv=
 for version in "${versions[@]}"; do
 	latest=$(curl -sSL 'https://owncloud.org/changelog/' |tac|tac| grep -o -m 1 "\(Version\|Release\) ${version}.[[:digit:]]\+" | sed -rn 's/(Version|Release) (.*)/\2/p')
-	sed -ri -e 's/^(ENV OWNCLOUD_VERSION) .*/\1 '"$latest"'/' "$version/Dockerfile"
-	
-	travisEnv='\n  - VERSION='"$version$travisEnv"
+	for variant in apache fpm; do
+		sed -ri -e 's/^(ENV OWNCLOUD_VERSION) .*/\1 '"$latest"'/' "$version/$variant/Dockerfile"
+		travisEnv='\n  - VERSION='"$version"' VARIANT='"$variant$travisEnv"
+	done
 done
 
 travis="$(awk -v 'RS=\n\n' '$1 == "env:" { $0 = "env:'"$travisEnv"'" } { printf "%s%s", $0, RS }' .travis.yml)"