diff --git a/7d0e76260d1f9bcdea3dc16c0c2b3b3a9fae20b1.patch b/7d0e76260d1f9bcdea3dc16c0c2b3b3a9fae20b1.patch
new file mode 100644
index 0000000000000000000000000000000000000000..2a5095f68123695513fb7359faf6aa6d81221065
--- /dev/null
+++ b/7d0e76260d1f9bcdea3dc16c0c2b3b3a9fae20b1.patch
@@ -0,0 +1,35 @@
+diff --git a/.bumpversion.cfg b/.bumpversion.cfg
+index 1592a271fb..7979a9dd27 100644
+--- a/.bumpversion.cfg
++++ b/.bumpversion.cfg
+@@ -1,5 +1,5 @@
+ [bumpversion]
+-current_version = 9.21.22
++current_version = 9.21.23
+ commit = True
+ tag = True
+ 
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index eeecc82db7..d6ada02232 100644
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -128,7 +128,7 @@ def setup(app):
+ # built documents.
+ #
+ # The short X.Y version.
+-version = '9.21.22'
++version = '9.21.23'
+ # The full version, including alpha/beta/rc tags.
+ release = version
+ 
+diff --git a/kiwi/version.py b/kiwi/version.py
+index ad4c315ef4..18e73b4cd8 100644
+--- a/kiwi/version.py
++++ b/kiwi/version.py
+@@ -18,5 +18,5 @@
+ """
+ Global version information used in kiwi and the package
+ """
+-__version__ = '9.21.22'
++__version__ = '9.21.23'
+ __githash__ = '$Format:%H$'
diff --git a/d48652023905f109d9eaaab7c9eab58ebc473901.patch b/d48652023905f109d9eaaab7c9eab58ebc473901.patch
new file mode 100644
index 0000000000000000000000000000000000000000..00d1befe032ba3479a555feff08bf425d2fc2c15
--- /dev/null
+++ b/d48652023905f109d9eaaab7c9eab58ebc473901.patch
@@ -0,0 +1,48 @@
+diff --git a/build-tests/x86/debian/test-image-live-disk/appliance.kiwi b/build-tests/x86/debian/test-image-live-disk/appliance.kiwi
+index 96a434f496..00df64647c 100644
+--- a/build-tests/x86/debian/test-image-live-disk/appliance.kiwi
++++ b/build-tests/x86/debian/test-image-live-disk/appliance.kiwi
+@@ -83,6 +83,7 @@
+         <package name="isc-dhcp-client"/>
+         <package name="netbase"/>
+         <package name="bsdmainutils"/>
++        <package name="usrmerge"/>
+     </packages>
+     <packages type="image" profiles="Live">
+         <package name="dracut-kiwi-live"/>
+@@ -91,7 +92,5 @@
+         <package name="dracut-kiwi-oem-repart"/>
+         <package name="dracut-kiwi-oem-dump"/>
+     </packages>
+-    <packages type="bootstrap">
+-        <package name="usrmerge"/>
+-    </packages>
++    <packages type="bootstrap"/>
+ </image>
+diff --git a/build-tests/x86/ubuntu/test-image-live-disk/appliance.kiwi b/build-tests/x86/ubuntu/test-image-live-disk/appliance.kiwi
+index dbc15cd790..15343dad2d 100644
+--- a/build-tests/x86/ubuntu/test-image-live-disk/appliance.kiwi
++++ b/build-tests/x86/ubuntu/test-image-live-disk/appliance.kiwi
+@@ -83,6 +83,12 @@
+         <package name="dbus"/>
+         <package name="btrfs-progs"/>
+         <package name="xz-utils"/>
++        <package name="usrmerge"/>
++        <!--
++            mawk is included so OBS adds it as a build dependency,
++            however this is installed by debootstrap
++        -->
++        <package name="mawk"/>
+     </packages>
+     <packages type="image" profiles="Live">
+         <package name="dracut-kiwi-live"/>
+@@ -91,8 +97,5 @@
+         <package name="dracut-kiwi-oem-repart"/>
+         <package name="dracut-kiwi-oem-dump"/>
+     </packages>
+-    <packages type="bootstrap">
+-        <package name="mawk"/>
+-        <package name="usrmerge"/>
+-    </packages>
++    <packages type="bootstrap"/>
+ </image>
diff --git a/kiwi.spec b/kiwi.spec
index e59772ea8362d71e3616a30ce27bb204a27f4290..e21ead5ede81ee86f03056a7c22fd6d46662284d 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -2,12 +2,14 @@
 
 Name:           kiwi
 Version:        9.21.5
-Release:        1
+Release:        2
 License:        GPLv3+
 Summary:        Flexible operating system image builder
 
 URL:            http://osinside.github.io/kiwi/
 Source0:        https://files.pythonhosted.org/packages/source/k/%{name}/%{name}-%{version}.tar.gz
+Patch6000: d48652023905f109d9eaaab7c9eab58ebc473901.patch
+Patch6001: 7d0e76260d1f9bcdea3dc16c0c2b3b3a9fae20b1.patch
 
 BuildRequires:  bash-completion dracut fdupes gcc make
 BuildRequires:  python3-devel python3-setuptools shadow-utils
@@ -189,6 +191,9 @@ done
 %{_mandir}/man8/%{name}*
 
 %changelog
+* 20201105163007679048 patch-tracking 9.21.5-2
+- append patch file of upstream repository from <d48652023905f109d9eaaab7c9eab58ebc473901> to <7d0e76260d1f9bcdea3dc16c0c2b3b3a9fae20b1>
+
 * Tue Jul 28 2020 xinghe <xinghe1@huawei.com> - 9.21.5-1
 - update version to 9.21.5
 
@@ -208,4 +213,4 @@ done
 - Remove python2 dependency
 
 * Sat Sep 21 2019 openEuler Buildteam <buildteam@openeuler.org> - 9.16.12-2
-- Package init
+- Package init
\ No newline at end of file