diff --git a/debian/changelog b/debian/changelog
index a9209e58..3581a0f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,10 @@ livecd-rootfs (2.374) UNRELEASED; urgency=medium
   * ubuntu-cpc:
     - exclude s390x from should_install_grub
 
+  [ Steve Langasek ]
+  * Refactor/reorder ubuntu-cpc support for consistency with other flavors,
+    so that subarch overrides can be applied correctly.
+
  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 Jan 2016 18:27:23 +0100
 
 livecd-rootfs (2.373) xenial; urgency=medium
diff --git a/live-build/auto/config b/live-build/auto/config
index 920519fe..05692012 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -470,6 +470,31 @@ case $PROJECT in
 		;;
 
 	ubuntu-cpc)
+		add_task install minimal standard cloud-image
+		add_package install ubuntu-minimal
+
+		BINARY_REMOVE_LINUX=false
+		OPTS="${OPTS:+$OPTS }--initramfs=none"
+		KERNEL_FLAVOURS=virtual
+		case $ARCH in
+			armhf)
+				KERNEL_FLAVOURS=generic-lpae
+				add_package install flash-kernel
+				add_task install server
+				;;
+			arm64)
+				KERNEL_FLAVOURS=generic
+				add_package install flash-kernel
+				add_task install server
+				;;
+			ppc64el)
+				add_task install server
+				;;
+		esac
+		OPTS="${OPTS:+$OPTS }--system=normal"
+		OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
+		OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
+		OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
 		;;
 
 	*)
@@ -555,33 +580,6 @@ case $PROJECT in
 		esac
 esac
 
-if [ "$PROJECT" = "ubuntu-cpc" ]; then
-	BINARY_REMOVE_LINUX=false
-	OPTS="${OPTS:+$OPTS }--initramfs=none"
-	KERNEL_FLAVOURS=virtual
-	case $ARCH in
-		armhf)
-			KERNEL_FLAVOURS=generic-lpae
-			add_package install flash-kernel
-			add_task install server
-			;;
-		arm64)
-			KERNEL_FLAVOURS=generic
-			add_package install flash-kernel
-			add_task install server
-			;;
-		ppc64el)
-			add_task install server
-			;;
-	esac
-	OPTS="${OPTS:+$OPTS }--system=normal"
-	OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
-	OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
-	OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
-	add_task install minimal standard cloud-image
-	add_package install ubuntu-minimal
-fi
-
 add_chroot_hook update-apt-file-cache
 add_chroot_hook update-apt-xapian-index
 add_chroot_hook update-mlocate-database