diff --git a/debian/changelog b/debian/changelog
index e3cbe562..ce4b8e64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ livecd-rootfs (2.399) UNRELEASED; urgency=medium
   * live-build/ubuntu-core/hooks/25-create-generic-initrd.chroot:
     kill the snappy os build if the initramfs-tools-ubuntu-core package
     is not found
+  * make s390x known to the snappy builds
+  * skip kernel snap an device tarball builds for s390x and ppc64el
+  * drop listing of the device tarballs, this was only for debugging
 
  -- Oliver Grawert <ogra@ubuntu.com>  Sun, 10 Apr 2016 17:23:05 +0200
 
diff --git a/live-build/auto/build b/live-build/auto/build
index 1e619edb..391f616d 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -379,7 +379,7 @@ case $PROJECT:$SUBPROJECT in
           arm64)
             subarches="generic dragonboard"
             ;;
-          i386|amd64|powerpc|ppc64el)
+          i386|amd64|powerpc|ppc64el|s390x)
             subarches="generic"
             ;;
       esac
@@ -410,6 +410,10 @@ case $PROJECT:$SUBPROJECT in
                   linux_package="linux-image-4.4.0-1009-snapdragon dragon410c-firmware"
               fi
               ;;
+            ppc64el|s390x)
+              echo "I: skipping kernel and device tarball for $ARCH"
+              return
+              ;;
         esac
 
         # make sure all virtual filesystems are available
@@ -586,8 +590,6 @@ EOF
       done
     fi
 
-    ls -l *device.tar.gz
-
     LB_LINUX_FLAVOURS=none
     ;;
 esac