diff --git a/0bcb621989c4caf73d0ade0651d2ffc2cbe74b7e.patch b/0bcb621989c4caf73d0ade0651d2ffc2cbe74b7e.patch
new file mode 100644
index 0000000000000000000000000000000000000000..29f6fc4518030357f5d96a6b40bed6c53c03b7d4
--- /dev/null
+++ b/0bcb621989c4caf73d0ade0651d2ffc2cbe74b7e.patch
@@ -0,0 +1,42 @@
+diff --git a/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh b/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh
+index d900e76cb6..a95f3c41ca 100755
+--- a/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh
++++ b/dracut/modules.d/90kiwi-dump/kiwi-dump-image.sh
+@@ -53,6 +53,7 @@ function get_disk_list {
+         disk_id=${kiwi_devicepersistency}
+     fi
+     max_disk=0
++    kiwi_oemmultipath_scan=$(bool "${kiwi_oemmultipath_scan}")
+     kiwi_oem_maxdisk=$(getarg rd.kiwi.oem.maxdisk=)
+     if [ -n "${kiwi_oem_maxdisk}" ]; then
+         max_disk=$(binsize_to_bytesize "${kiwi_oem_maxdisk}") || max_disk=0
+@@ -71,7 +72,7 @@ function get_disk_list {
+         # target should be a ramdisk on request. Thus instruct
+         # lsblk to list only ramdisk devices (Major=1)
+         blk_opts="-I 1 ${blk_opts}"
+-    elif [ -n "${kiwi_oemmultipath_scan}" ];then
++    elif [ "${kiwi_oemmultipath_scan}" = "true" ];then
+         scan_multipath_devices
+     fi
+     for disk_meta in $(
+diff --git a/dracut/modules.d/99kiwi-lib/kiwi-lib.sh b/dracut/modules.d/99kiwi-lib/kiwi-lib.sh
+index 66d06d93ba..ad847cf31d 100644
+--- a/dracut/modules.d/99kiwi-lib/kiwi-lib.sh
++++ b/dracut/modules.d/99kiwi-lib/kiwi-lib.sh
+@@ -50,6 +50,7 @@ function lookup_disk_device_from_root {
+     local root_device=${root#block:}
+     local disk_device
+     local wwn
++    kiwi_oemmultipath_scan=$(bool "${kiwi_oemmultipath_scan}")
+     if [ -z "${root_device}" ];then
+         die "No root device found"
+     fi
+@@ -62,7 +63,7 @@ function lookup_disk_device_from_root {
+     ); do
+         # If multipath is requested, set the disk_device to the
+         # multipath mapped device
+-        if [ -n "${kiwi_oemmultipath_scan}" ];then
++        if [ "${kiwi_oemmultipath_scan}" = "true" ];then
+             disk_device=$(get_mapped_multipath_disk "${disk_device}")
+         fi
+         # Check if root_device is managed by mdadm and that the md raid
diff --git a/4aa07502a0c74789e2137b60fe57c1d1230d3eb0.patch b/4aa07502a0c74789e2137b60fe57c1d1230d3eb0.patch
new file mode 100644
index 0000000000000000000000000000000000000000..131614ff3b4ca0b47ab47156d713b0dd0b3f6b16
--- /dev/null
+++ b/4aa07502a0c74789e2137b60fe57c1d1230d3eb0.patch
@@ -0,0 +1,39 @@
+diff --git a/.bumpversion.cfg b/.bumpversion.cfg
+index 2ff0a265ab..3bf2e82ec9 100644
+--- a/.bumpversion.cfg
++++ b/.bumpversion.cfg
+@@ -1,8 +1,9 @@
+ [bumpversion]
+-current_version = 9.22.0
++current_version = 9.22.1
+ commit = True
+ tag = True
+ 
+ [bumpversion:file:kiwi/version.py]
+ 
+ [bumpversion:file:doc/source/conf.py]
++
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index a142a41f92..99f5696a36 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.22.0'
++version = '9.22.1'
+ # The full version, including alpha/beta/rc tags.
+ release = version
+ 
+diff --git a/kiwi/version.py b/kiwi/version.py
+index 4af9a4ce3e..9daea1fdca 100644
+--- a/kiwi/version.py
++++ b/kiwi/version.py
+@@ -18,5 +18,5 @@
+ """
+ Global version information used in kiwi and the package
+ """
+-__version__ = '9.22.0'
++__version__ = '9.22.1'
+ __githash__ = '$Format:%H$'
diff --git a/kiwi.spec b/kiwi.spec
index a5ce47a982ee54f1c9419621cedf40edbd4231b3..4cf9439073c8960fcb3209094bbd0cf8141631eb 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -2,7 +2,7 @@
 
 Name:           kiwi
 Version:        9.21.5
-Release:        2
+Release:        3
 License:        GPLv3+
 Summary:        Flexible operating system image builder
 
@@ -15,6 +15,8 @@ Patch2:	Include-box-plugin-images-to-build_status.patch
 Patch3:	Added-s390-SLE15-integration-tests.patch
 Patch4:	Cosmetic-update-for-build-status-helper.patch
 Patch5:	Added-universal-box-to-build-status-helper.patch
+Patch6000: 0bcb621989c4caf73d0ade0651d2ffc2cbe74b7e.patch
+Patch6001: 4aa07502a0c74789e2137b60fe57c1d1230d3eb0.patch
 
 BuildRequires:  bash-completion dracut fdupes gcc make
 BuildRequires:  python3-devel python3-setuptools shadow-utils
@@ -196,6 +198,9 @@ done
 %{_mandir}/man8/%{name}*
 
 %changelog
+* 20201208195849779433 patch-tracking 9.21.5-3
+- append patch file of upstream repository from <0bcb621989c4caf73d0ade0651d2ffc2cbe74b7e> to <4aa07502a0c74789e2137b60fe57c1d1230d3eb0>
+
 * Thu Nov 26 2020 wuchaochao <wuchaochao4@huawei.com> - 9.21.5-2
 - Type:bugfix
 - ID:NA
@@ -221,4 +226,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