diff --git a/python-kiwi-boot-packages b/python-kiwi-boot-packages
index 54f13b3..59b66ea 100644
--- a/python-kiwi-boot-packages
+++ b/python-kiwi-boot-packages
@@ -123,8 +123,8 @@ i686:suse-tumbleweed:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs b
 ppc:suse-tumbleweed:no_boot_descriptions_for_suse-tumbleweed_on_ppc_available
 ppc64:suse-tumbleweed:no_boot_descriptions_for_suse-tumbleweed_on_ppc64_available
 ppc64le:suse-tumbleweed:no_boot_descriptions_for_suse-tumbleweed_on_ppc64le_available
-s390:suse-tumbleweed:no_boot_descriptions_for_suse-tumbleweed_on_s390_available
-s390x:suse-tumbleweed:no_boot_descriptions_for_suse-tumbleweed_on_s390x_available
+s390:suse-tumbleweed:atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale grub2 grub2-s390x-emu hwinfo iproute2 iputils kbd kernel-default kexec-tools kiwi-tools kpartx lvm2 make mdadm module-init-tools multipath-tools net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync s390-tools squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz
+s390x:suse-tumbleweed:atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime glibc glibc-locale grub2 grub2-s390x-emu hwinfo iproute2 iputils kbd kernel-default kexec-tools kiwi-tools kpartx lvm2 make mdadm module-init-tools multipath-tools net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc rsync s390-tools squashfs sysconfig sysfsutils sysvinit-tools tar timezone udev util-linux which wicked xfsprogs xz
 x86_64:suse-tumbleweed:adaptec-firmware atftp bc bind-libs bind-utils btrfsprogs busybox bzip2 cdrkit-cdrtools-compat checkmedia cryptsetup curl dialog diffutils dmraid dosfstools e2fsprogs fbiterm file filesystem fribidi gawk genisoimage gettext-runtime gfxboot glibc glibc-locale gptfdisk grub2 grub2-i386-pc grub2-x86_64-efi grub2-x86_64-xen hdparm hwinfo ifplugd iproute2 iputils kbd kernel-default kernel-desktop kernel-ec2 kernel-firmware kernel-xen kexec-tools kiwi-tools kmod-compat kpartx lvm2 make mdadm memtest86+ nbd net-tools netcfg nfs-client parted pciutils plymouth plymouth-scripts procps psmisc qemu-tools rpm rsync shim squashfs sysconfig sysfsutils syslinux sysvinit-tools tar timezone udev util-linux which wicked xen xfsprogs xz
 aarch64:ubuntu-xenial:no_boot_descriptions_for_ubuntu-xenial_on_aarch64_available
 arm:ubuntu-xenial:no_boot_descriptions_for_ubuntu-xenial_on_arm_available
diff --git a/python-kiwi.changes b/python-kiwi.changes
index bf97a70..8e53216 100644
--- a/python-kiwi.changes
+++ b/python-kiwi.changes
@@ -1,6 +1,16 @@
+-------------------------------------------------------------------
+Tue Jul 18 10:27:21 CEST 2017 - ms@suse.de
+
+- Bump version: 9.9.4 → 9.9.5
+  
+-------------------------------------------------------------------
+Tue Jul 18 10:26:54 CEST 2017 - ms@suse.de
+  
+- Added s390 tumbleweed boot descriptions
+  
 -------------------------------------------------------------------
 Mon Jul 17 15:35:55 CEST 2017 - ms@suse.de
-
+  
 - Bump version: 9.9.3 → 9.9.4
   
 -------------------------------------------------------------------
@@ -10,6 +20,17 @@ Mon Jul 17 12:26:27 CEST 2017 - dcassany@suse.com
   
   This commit fixes regression bug introduced in #422
   
+-------------------------------------------------------------------
+Mon Jul 17 11:15:27 CEST 2017 - dcassany@suse.com
+  
+- Exclude kiwi files from images
+  
+  This commit from one hand includes a
+  get_exclude_list_for_root_data_sync method in Defaults which returns
+  a list of the files used by KIWI that should not be part of the
+  resulting image. From the other hand makes use of the exclusion
+  default list in live, archive and container images, it fixes #423.
+  
 -------------------------------------------------------------------
 Mon Jul 17 10:58:47 CEST 2017 - ms@suse.de
   
diff --git a/python-kiwi.spec b/python-kiwi.spec
index 2630457..509ce7c 100644
--- a/python-kiwi.spec
+++ b/python-kiwi.spec
@@ -67,7 +67,7 @@
 %endif
 
 Name:           python-kiwi
-Version:        9.9.4
+Version:        9.9.5
 Release:        0
 Provides:       kiwi-schema = 6.5
 Url:            https://github.com/SUSE/kiwi
diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz
index 9025bd3..cac87ef 100644
--- a/python-kiwi.tar.gz
+++ b/python-kiwi.tar.gz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f9e45e4259e83348bf87f818ee2d17ef44cd75ed29849c8596bd4f1d64c322ec
-size 3343353
+oid sha256:dc69f3bc29e0d2966c46b4b8b470302f6b3410f464780eb163c5b6dc2312682f
+size 3536326