diff -urpN cpu-checker-0.7.orig/debian/control cpu-checker-0.7/debian/control
--- cpu-checker-0.7.orig/debian/control	2015-10-21 16:14:38.000000000 +0200
+++ cpu-checker-0.7/debian/control	2015-12-15 02:13:48.076899562 +0100
@@ -9,7 +9,7 @@ Vcs-Browser: https://code.launchpad.net/
 Vcs-Bzr: lp:~cpu-checker-dev/cpu-checker/trunk
 
 Package: cpu-checker
-Architecture: amd64 arm64 armhf i386 ppc64el powerpc
+Architecture: amd64 arm64 armhf i386 ppc64el powerpc s390x
 Depends: msr-tools [amd64 i386], ${shlibs:Depends}, ${misc:Depends}
 Conflicts: qemu-kvm (<< 0.12.3-0ubuntu13)
 Replaces: qemu-kvm (<< 0.12.3-0ubuntu13)
diff -urpN cpu-checker-0.7.orig/kvm-ok cpu-checker-0.7/kvm-ok
--- cpu-checker-0.7.orig/kvm-ok	2015-12-15 01:55:30.716899562 +0100
+++ cpu-checker-0.7/kvm-ok	2015-12-15 02:08:55.926899562 +0100
@@ -42,30 +42,29 @@ verdict() {
 ARM_CPU_PART_CORTEX_A15="0xc0f" # <asm/cputype.h>
 
 # check cpu flags for capability
-if [ "$(uname -m)" = "armv7l" ]; then
-    if egrep -m1 -w '^CPU part[[:blank:]]*:' /proc/cpuinfo | \
-	egrep -wq "$ARM_CPU_PART_CORTEX_A15"; then
+case "$(uname -m)" in
+    armv7l)
+	if egrep -m1 -w '^CPU part[[:blank:]]*:' /proc/cpuinfo | \
+		egrep -wq "$ARM_CPU_PART_CORTEX_A15"; then
+	    virt="ARM"
+	    kvm_mod="kvm"
+	fi
+	;;
+    aarch64)
 	virt="ARM"
 	kvm_mod="kvm"
-    fi
-elif [ "$(uname -m)" = "aarch64" ]; then
-	virt="ARM"
-	kvm_mod="kvm"
-elif [ "$(uname -m)" = "ppc64le" ]; then
-	# FIXME: Assume that all ppc64el is kvm capable
-	exit 0
-	virt="POWER"
-	kvm_mod="kvm"
-elif [ "$(uname -m)" = "ppc64" ]; then
-	# FIXME: Assume that all ppc64 is kvm capable
-	exit 0
-	virt="POWER"
+	;;
+    ppc64le|ppc64|ppc64|s390x)
+	# FIXME: Assume that all Power/S390 is KVM capable
+	virt="generic"
 	kvm_mod="kvm"
-else
-    virt=$(egrep -m1 -w '^flags[[:blank:]]*:' /proc/cpuinfo | egrep -wo '(vmx|svm)') || true
-    [ "$virt" = "vmx" ] && kvm_mod="kvm_intel"
-    [ "$virt" = "svm" ] && kvm_mod="kvm_amd"
-fi
+	;;
+    *)
+      virt=$(egrep -m1 -w '^flags[[:blank:]]*:' /proc/cpuinfo | egrep -wo '(vmx|svm)') || true
+      [ "$virt" = "vmx" ] && kvm_mod="kvm_intel"
+      [ "$virt" = "svm" ] && kvm_mod="kvm_amd"
+      ;;
+esac
 
 if [ -z "$virt" ]; then
 	echo "INFO: Your CPU does not support KVM extensions"
@@ -116,8 +115,7 @@ elif [ "$virt" = "svm" ]; then
 elif [ "$virt" = "ARM" ]; then
     # Should also test that we booted in HYP mode, if detectable
     :
-elif [ "$virt" = "POWER" ]; then
-    # Should also test that we booted in HYP mode, if detectable
+elif [ "$virt" = "generic" ]
     :
 else
 	echo "FAIL: Unknown virtualization extension: $virt"