diff --git a/python-kiwi.changes b/python-kiwi.changes
index 21745f9..babed4c 100644
--- a/python-kiwi.changes
+++ b/python-kiwi.changes
@@ -1,6 +1,62 @@
+-------------------------------------------------------------------
+Wed May 16 11:48:00 CEST 2018 - ms@suse.de
+
+- Bump version: 9.15.1 → 9.15.2
+  
+-------------------------------------------------------------------
+Wed May 16 11:31:40 CEST 2018 - dcassany@suse.com
+  
+- Fix zypper add lock operations
+  
+  This commit fixes the arguments passed to zypper in add lock
+  operations.
+  
+-------------------------------------------------------------------
+Tue May 15 15:48:24 CEST 2018 - dcassany@suse.com
+  
+- Add correct GPL-3.0-or-later license
+  
+  Add the correct license reference in the spec License field
+  
+  Fixes #732
+  
+-------------------------------------------------------------------
+Tue May 15 11:18:22 CEST 2018 - ms@suse.de
+  
+- Make container compression a configuration option
+  
+  Change the ContainerBuilder class to evaluate on the
+  configuration options to decide if the container archive
+  should be compressed or not. By default the archive will
+  be compressed, thus there is no change to the former behavior
+  but can be setup in ~/.config/kiwi/config.yml as follows:
+  
+  container:
+- compress: none|xz
+  
+  This Fixes #725
+  
+-------------------------------------------------------------------
+Tue May 15 10:36:57 CEST 2018 - ms@suse.de
+  
+- Return file name after archive or compression call
+  
+  Extend the ArchiveTar and Compress classes such that
+  their archiving and compression methods returns the
+  result file name after the operation
+  
+-------------------------------------------------------------------
+Tue May 15 10:02:52 CEST 2018 - ms@suse.de
+  
+- Allow docker root import from uncompressed file
+  
+  Check the given file name for its compression format and
+  only uncompress if a supported format could be detected.
+  This Fixes #730
+  
 -------------------------------------------------------------------
 Wed May  9 14:53:02 CEST 2018 - ms@suse.de
-
+  
 - Bump version: 9.15.0 → 9.15.1
   
 -------------------------------------------------------------------
diff --git a/python-kiwi.spec b/python-kiwi.spec
index da39ead..940f707 100644
--- a/python-kiwi.spec
+++ b/python-kiwi.spec
@@ -38,12 +38,12 @@
 %endif
 
 Name:           python-kiwi
-Version:        9.15.1
+Version:        9.15.2
 Provides:       kiwi-schema = 6.6
 Release:        0
 Url:            https://github.com/SUSE/kiwi
 Summary:        KIWI - Appliance Builder Next Generation
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 %if %{_vendor} == "debbuild"
 # Needed to set Maintainer in output debs
 Packager:       Marcus Schaefer <ms@suse.de>
@@ -232,7 +232,7 @@ virtualization and cloud systems like Xen, KVM, VMware, EC2 and more.
 
 %package -n kiwi-tools
 Summary:        KIWI - Collection of Boot Helper Tools
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          %{sysgroup}
 
 %description -n kiwi-tools
@@ -251,7 +251,7 @@ Requires(pre):  shadow-utils
 %else
 Requires(pre):  shadow
 %endif
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          %{sysgroup}
 
 %description -n kiwi-pxeboot
@@ -298,7 +298,7 @@ Requires:       device-mapper
 %ifarch s390 s390x
 Requires:       s390-tools
 %endif
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          %{sysgroup}
 
 %description -n dracut-kiwi-lib
@@ -314,7 +314,7 @@ Summary:        KIWI - Dracut module for oem(repart) image type
 BuildRequires:  dracut
 %endif
 Requires:       dracut-kiwi-lib
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          %{sysgroup}
 
 %description -n dracut-kiwi-oem-repart
@@ -340,7 +340,7 @@ Requires:       multipath-tools
 Requires:       device-mapper-multipath
 %endif
 Requires:       gawk
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          %{sysgroup}
 
 %description -n dracut-kiwi-oem-dump
@@ -370,7 +370,7 @@ Requires:       device-mapper
 %endif
 Requires:       dracut
 Requires:       xorriso
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          %{sysgroup}
 
 %description -n dracut-kiwi-live
@@ -387,7 +387,7 @@ BuildRequires:  dracut
 %endif
 Requires:       util-linux
 Requires:       dracut
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          %{sysgroup}
 
 %description -n dracut-kiwi-overlay
@@ -397,7 +397,7 @@ overlay root filesystem
 
 %package -n kiwi-man-pages
 Summary:        KIWI - manual pages
-License:        GPL-3.0+
+License:        GPL-3.0-or-later
 Group:          %{sysgroup}
 
 %description -n kiwi-man-pages
diff --git a/python-kiwi.tar.gz b/python-kiwi.tar.gz
index acf4312..a7b20e5 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:1ebb80fb06ce2ab302b984a6d0bbd3f7ed47221044465ad17881080df1a699cc
-size 524101
+oid sha256:5b6879fead294e9a7326b44cb119fc090391f307aa292d3cc2c14ae31f66e0fc
+size 524823