diff -Nru base-installer-1.158ubuntu3/debian/changelog base-installer-1.158ubuntu4/debian/changelog
--- base-installer-1.158ubuntu3/debian/changelog	2016-05-03 23:43:57.000000000 +0000
+++ base-installer-1.158ubuntu4/debian/changelog	2016-09-19 21:44:51.000000000 +0000
@@ -1,3 +1,9 @@
+base-installer (1.158ubuntu4) yakkety; urgency=medium
+
+  * Use the generic kernel for the powerpc64 flavor (LP: #1625368)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Mon, 19 Sep 2016 15:44:51 -0600
+
 base-installer (1.158ubuntu3) yakkety; urgency=medium
 
   * Tolerate omission of leading "deb " in apt-setup/local0/repository
diff -Nru base-installer-1.158ubuntu3/kernel/powerpc.sh base-installer-1.158ubuntu4/kernel/powerpc.sh
--- base-installer-1.158ubuntu3/kernel/powerpc.sh	2016-05-03 23:36:46.000000000 +0000
+++ base-installer-1.158ubuntu4/kernel/powerpc.sh	2016-09-19 21:42:00.000000000 +0000
@@ -2,9 +2,9 @@
 	CPU=`grep '^cpu[[:space:]]*:' "$CPUINFO" | head -n1 | cut -d: -f2 | sed 's/^ *//; s/[, ].*//' | tr A-Z a-z`
 	case "$CPU" in
 	    ppc970*|power3|power4*|power5*|power6*|power7*|power8*)
-		family=powerpc64 ;;
+		family=generic ;;
 	    cell|i-star|s-star|pa6t|rs64-*)
-		family=powerpc64 ;;
+		family=generic ;;
 	    e500mc)
 		echo powerpc-e500mc
 		return 0 ;;
@@ -18,7 +18,7 @@
 	    powermac*|prep|chrp*|pasemi)
 		echo "$family" ;;
 	    ps3|cell)
-		echo powerpc64 ;;
+		echo generic ;;
 	    amiga)
 		echo apus ;;
 	    *)
@@ -35,7 +35,7 @@
 }
 
 arch_get_kernel () {
-	if [ "$1" = "powerpc64" ] || [ "$1" = "powerpc" ]; then
+	if [ "$1" = "powerpc" ]; then
 		SMP=-smp
 	else
 		SMP=
diff -Nru base-installer-1.158ubuntu3/kernel/tests/powerpc/chrp_ibm.test base-installer-1.158ubuntu4/kernel/tests/powerpc/chrp_ibm.test
--- base-installer-1.158ubuntu3/kernel/tests/powerpc/chrp_ibm.test	2014-02-14 13:44:05.000000000 +0000
+++ base-installer-1.158ubuntu4/kernel/tests/powerpc/chrp_ibm.test	2016-09-19 21:43:20.000000000 +0000
@@ -1,16 +1,14 @@
 subarch chrp_ibm
 cpuinfo chrp_ibm.cpuinfo
 majors 2.6
-flavour powerpc64
+flavour generic
 kernel-2.6 \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-powerpc64 \
-  linux-image-powerpc64
+  linux-generic \
+  linux-image-generic
 usable \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-image-2.6.20-15-powerpc64-smp
+  linux-generic \
+  linux-image-generic \
+  linux-image-2.6.20-15-generic
 unusable \
   linux-powerpc \
   linux-powerpc-smp \
diff -Nru base-installer-1.158ubuntu3/kernel/tests/powerpc/e500mc.test base-installer-1.158ubuntu4/kernel/tests/powerpc/e500mc.test
--- base-installer-1.158ubuntu3/kernel/tests/powerpc/e500mc.test	2012-11-16 15:58:52.000000000 +0000
+++ base-installer-1.158ubuntu4/kernel/tests/powerpc/e500mc.test	2016-09-19 21:38:39.000000000 +0000
@@ -12,10 +12,10 @@
 unusable \
   linux-powerpc \
   linux-powerpc-smp \
-  linux-powerpc64-smp \
+  linux-generic \
   linux-image-powerpc \
   linux-image-powerpc-smp \
-  linux-image-powerpc64-smp \
+  linux-image-generic \
   linux-image-3.7.0-0-powerpc \
   linux-image-3.7.0-0-powerpc-smp \
-  linux-image-3.7.0-0-powerpc64-smp
+  linux-image-3.7.0-0-generic
diff -Nru base-installer-1.158ubuntu3/kernel/tests/powerpc/g5.test base-installer-1.158ubuntu4/kernel/tests/powerpc/g5.test
--- base-installer-1.158ubuntu3/kernel/tests/powerpc/g5.test	2014-02-14 13:44:25.000000000 +0000
+++ base-installer-1.158ubuntu4/kernel/tests/powerpc/g5.test	2016-09-19 21:43:29.000000000 +0000
@@ -1,16 +1,14 @@
 subarch powermac_newworld
 cpuinfo g5.cpuinfo
 majors 2.6
-flavour powerpc64
+flavour generic
 kernel-2.6 \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-powerpc64 \
-  linux-image-powerpc64
+  linux-generic \
+  linux-image-generic
 usable \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-image-2.6.20-15-powerpc64-smp
+  linux-generic \
+  linux-image-generic \
+  linux-image-2.6.20-15-generic
 unusable \
   linux-powerpc \
   linux-powerpc-smp \
diff -Nru base-installer-1.158ubuntu3/kernel/tests/powerpc/powermac7,3.test base-installer-1.158ubuntu4/kernel/tests/powerpc/powermac7,3.test
--- base-installer-1.158ubuntu3/kernel/tests/powerpc/powermac7,3.test	2014-02-14 13:44:42.000000000 +0000
+++ base-installer-1.158ubuntu4/kernel/tests/powerpc/powermac7,3.test	2016-09-19 21:43:39.000000000 +0000
@@ -1,16 +1,14 @@
 subarch powermac_newworld
 cpuinfo powermac7,3.cpuinfo
 majors 2.6
-flavour powerpc64
+flavour generic
 kernel-2.6 \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-powerpc64 \
-  linux-image-powerpc64
+  linux-generic \
+  linux-image-generic
 usable \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-image-2.6.20-15-powerpc64-smp
+  linux-generic \
+  linux-image-generic \
+  linux-image-2.6.20-15-generic
 unusable \
   linux-powerpc \
   linux-powerpc-smp \
diff -Nru base-installer-1.158ubuntu3/kernel/tests/powerpc/powermac_newworld-smp.test base-installer-1.158ubuntu4/kernel/tests/powerpc/powermac_newworld-smp.test
--- base-installer-1.158ubuntu3/kernel/tests/powerpc/powermac_newworld-smp.test	2014-02-14 14:03:28.000000000 +0000
+++ base-installer-1.158ubuntu4/kernel/tests/powerpc/powermac_newworld-smp.test	2016-09-19 21:39:45.000000000 +0000
@@ -16,7 +16,7 @@
   linux-image-2.6.18-4-powerpc-miboot \
   linux-image-2.6.18-4-powerpc-smp
 unusable \
-  linux-image-powerpc64 \
+  linux-image-generic \
   linux-image-prep \
-  linux-image-2.6.18-4-powerpc64 \
+  linux-image-2.6.18-4-generic \
   linux-image-2.6.18-4-prep
diff -Nru base-installer-1.158ubuntu3/kernel/tests/powerpc/powermac_newworld.test base-installer-1.158ubuntu4/kernel/tests/powerpc/powermac_newworld.test
--- base-installer-1.158ubuntu3/kernel/tests/powerpc/powermac_newworld.test	2014-02-14 13:45:06.000000000 +0000
+++ base-installer-1.158ubuntu4/kernel/tests/powerpc/powermac_newworld.test	2016-09-19 21:38:39.000000000 +0000
@@ -16,6 +16,6 @@
   linux-image-2.6.20-15-powerpc \
   linux-image-2.6.20-15-powerpc-smp
 unusable \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-image-2.6.20-15-powerpc64-smp
+  linux-generic \
+  linux-image-generic \
+  linux-image-2.6.20-15-generic
diff -Nru base-installer-1.158ubuntu3/kernel/tests/powerpc/powerstackII.test base-installer-1.158ubuntu4/kernel/tests/powerpc/powerstackII.test
--- base-installer-1.158ubuntu3/kernel/tests/powerpc/powerstackII.test	2014-02-14 13:45:19.000000000 +0000
+++ base-installer-1.158ubuntu4/kernel/tests/powerpc/powerstackII.test	2016-09-19 21:38:39.000000000 +0000
@@ -15,6 +15,6 @@
   linux-image-2.6.20-15-powerpc \
   linux-image-2.6.20-15-powerpc-smp
 unusable \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-image-2.6.20-15-powerpc64-smp
+  linux-generic \
+  linux-image-generic \
+  linux-image-2.6.20-15-generic
diff -Nru base-installer-1.158ubuntu3/kernel/tests/powerpc/ps3.test base-installer-1.158ubuntu4/kernel/tests/powerpc/ps3.test
--- base-installer-1.158ubuntu3/kernel/tests/powerpc/ps3.test	2014-02-14 13:45:35.000000000 +0000
+++ base-installer-1.158ubuntu4/kernel/tests/powerpc/ps3.test	2016-09-19 21:43:53.000000000 +0000
@@ -1,16 +1,14 @@
 subarch ps3
 cpuinfo ps3.cpuinfo
 majors 2.6
-flavour powerpc64
+flavour generic
 kernel-2.6 \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-powerpc64 \
-  linux-image-powerpc64
+  linux-generic \
+  linux-image-generic
 usable \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-image-2.6.24-16-powerpc64-smp
+  linux-generic \
+  linux-image-generic \
+  linux-image-2.6.24-16-generic
 unusable \
   linux-powerpc \
   linux-powerpc-smp \
diff -Nru base-installer-1.158ubuntu3/kernel/tests/powerpc/rs64-iv.test base-installer-1.158ubuntu4/kernel/tests/powerpc/rs64-iv.test
--- base-installer-1.158ubuntu3/kernel/tests/powerpc/rs64-iv.test	2014-02-14 13:45:49.000000000 +0000
+++ base-installer-1.158ubuntu4/kernel/tests/powerpc/rs64-iv.test	2016-09-19 21:44:03.000000000 +0000
@@ -1,16 +1,14 @@
 subarch chrp_ibm
 cpuinfo rs64-iv.cpuinfo
 majors 2.6
-flavour powerpc64
+flavour generic
 kernel-2.6 \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-powerpc64 \
-  linux-image-powerpc64
+  linux-generic \
+  linux-image-generic
 usable \
-  linux-powerpc64-smp \
-  linux-image-powerpc64-smp \
-  linux-image-2.6.20-15-powerpc64-smp
+  linux-generic \
+  linux-image-generic \
+  linux-image-2.6.20-15-generic
 unusable \
   linux-powerpc \
   linux-powerpc-smp \