--- base-installer-1.158ubuntu1/debian/changelog	2015-12-08 15:29:10.000000000 +0000
+++ base-installer-1.158ubuntu2/debian/changelog	2016-01-25 17:33:39.000000000 +0000
@@ -1,3 +1,9 @@
+base-installer (1.158ubuntu2) xenial; urgency=high
+
+  * Fix s390x kernels.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 25 Jan 2016 17:33:27 +0000
+
 base-installer (1.158ubuntu1) xenial; urgency=medium
 
   * Resynchronise with Debian.  Remaining changes:
diff -Nru base-installer-1.158ubuntu1/kernel/s390x.sh base-installer-1.158ubuntu2/kernel/s390x.sh
--- base-installer-1.158ubuntu1/kernel/s390x.sh	2015-12-04 15:47:00.000000000 +0000
+++ base-installer-1.158ubuntu2/kernel/s390x.sh	2016-01-25 17:27:46.000000000 +0000
@@ -1,19 +1,17 @@
 arch_get_kernel_flavour () {
-	echo $MACHINE
-	return 0
+	echo s390x
 }
 
 arch_check_usable_kernel () {
-	case "$1" in
-	    *-s390x-tape)
-		# Bastian Blank says: "-s390-tape is only a kernel
-		# image without any logic and modules"
-		return 1 ;;
-	    *)
-		return 0 ;;
-	esac
+	if echo "$1" | grep -Eq -- "-(generic|virtual)(-.*)?$"; then return 0; fi
+
+	return 1
 }
 
 arch_get_kernel () {
-	echo "linux-image-$1"
+	echo "linux-generic"
+	echo "linux-image-generic"
+
+	echo "linux-virtual"
+	echo "linux-image-virtual"
 }
diff -Nru base-installer-1.158ubuntu1/kernel/tests/s390x/iic.test base-installer-1.158ubuntu2/kernel/tests/s390x/iic.test
--- base-installer-1.158ubuntu1/kernel/tests/s390x/iic.test	2015-12-04 15:47:00.000000000 +0000
+++ base-installer-1.158ubuntu2/kernel/tests/s390x/iic.test	2016-01-25 17:33:15.000000000 +0000
@@ -3,8 +3,9 @@
 flavour s390x
 majors 2.6
 kernel-2.6 \
-  linux-image-s390x
+  linux-generic \
+  linux-image-generic \
+  linux-virtual \
+  linux-image-virtual
 usable \
-  linux-image-s390x
-unusable \
-  linux-image-s390x-tape
+  linux-image-generic