diff --git a/PKGBUILD b/PKGBUILD
index 7b04502..843d066 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=('python-kiwi' 'kiwi-man-pages' 'dracut-kiwi-lib' 'dracut-kiwi-oem-repart' 'dracut-kiwi-oem-dump' 'dracut-kiwi-live' 'dracut-kiwi-overlay')
 arch=(x86_64)
-pkgver=9.21.12
+pkgver=9.21.14
 pkgrel=0
 pkgdesc="KIWI - Appliance Builder Next Generation"
 url="https://github.com/SUSE/kiwi/tarball/master"
@@ -12,7 +12,7 @@ makedepends=(python-setuptools gcc shadow grep)
 provides=(kiwi-ng kiwi)
 source=("${pkgname}.tar.gz")
 changelog="${pkgname}.changes"
-md5sums=('4a53060035ad977dd7633997d13401ce')
+md5sums=('fefbad94106141392d967912d4ba4084')
 
 
 build() {
diff --git a/python-kiwi.changes b/python-kiwi.changes
index 6d5a896..6c02bc8 100644
--- a/python-kiwi.changes
+++ b/python-kiwi.changes
@@ -1,3 +1,57 @@
+-------------------------------------------------------------------
+Wed Sep 23 13:06:47 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Bump version: 9.21.13 → 9.21.14
+
+-------------------------------------------------------------------
+Wed Sep 23 10:49:20 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Fixed s390/sle15 Virtual disk integration test
+
+  The integration test used FBA mode as target. As the target
+  is expected to be KVM this is the wrong setting. SCSI should
+  be used instead. This Fixes bsc#1170863
+
+-------------------------------------------------------------------
+Wed Sep 23 10:21:40 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Followup fix to handle one disk type better
+
+  The vmx type is auto converted into an oem type with rootfs
+  resize disabled such that all disk images can be handled
+  under one disk type. However people who run kiwi on the
+  commandline and have selected --type vmx before now end
+  with an error message saying that there is no vmx type
+  because it was converted into an oem type. To handle this
+  more gracefully this commit changes the commandline
+  option --type vmx into --type oem if provided and prints
+  a warning message.
+
+-------------------------------------------------------------------
+Tue Sep 22 12:19:15 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Bump version: 9.21.12 → 9.21.13
+
+-------------------------------------------------------------------
+Tue Sep 22 11:36:52 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Cleanup grub adaptions code
+
+  The grub setup code has some after grub-mkconfig code that
+  fixes the written grub.cfg file on certain conditions. For
+  a better understanding and readability those conditions
+  and reasons are now put into private _fix* methods that
+  explains why we need to patch the written grub config file.
+  We all hope that those methods can go away when grub gets
+  fixed properly. This Fixes #1527
+
+-------------------------------------------------------------------
+Mon Sep 21 17:04:08 CEST 2020 - Marcus Schäfer <ms@suse.de>
+
+- Cosmetic update for build status helper
+
+  Show disabled integration test builds with a clear indicator
+
 -------------------------------------------------------------------
 Mon Sep 21 15:54:33 CEST 2020 - Marcus Schäfer <ms@suse.de>
 
diff --git a/python-kiwi.spec b/python-kiwi.spec
index 5046dca..0dac3f6 100644
--- a/python-kiwi.spec
+++ b/python-kiwi.spec
@@ -43,7 +43,7 @@
 %endif
 
 Name:           python-kiwi
-Version:        9.21.12
+Version:        9.21.14
 Provides:       kiwi-schema = 7.2
 Release:        0
 Url:            https://github.com/OSInside/kiwi
diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz
index 4e8a47d..34f2b03 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:7b67487fcd6bb0a4635b9f38c44e2b5e73117474802ae4e39a7617a67d9b153b
-size 1723989
+oid sha256:52c065b2da55cc4843e49965b7ce025937d41f3e5847208470d8f5b3abf0f79c
+size 1724750