diff --git a/019ccaf292201d5309856dc18ddd1b0ad8f6a70e.patch b/019ccaf292201d5309856dc18ddd1b0ad8f6a70e.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d010c519b335da28dccd3e215f511e78f86932d6
--- /dev/null
+++ b/019ccaf292201d5309856dc18ddd1b0ad8f6a70e.patch
@@ -0,0 +1,52 @@
+diff --git a/build-tests/x86/suse/test-image-azure/config.sh b/build-tests/x86/suse/test-image-azure/config.sh
+index 8218f60954..c15cc8d5ba 100644
+--- a/build-tests/x86/suse/test-image-azure/config.sh
++++ b/build-tests/x86/suse/test-image-azure/config.sh
+@@ -77,7 +77,7 @@ sed -i -e 's/AutoUpdate.Enabled=y/AutoUpdate.Enabled=n/' /etc/waagent.conf
+ 
+ # Remove the password for root
+ # Note the string matches the password set in the config file
+-sed -i 's/$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0/*/' /etc/shadow
++# sed -i 's/$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0/*/' /etc/shadow
+ 
+ # Implement password policy
+ # Length: 6-72 characters long
+diff --git a/build-tests/x86/suse/test-image-ec2/config.sh b/build-tests/x86/suse/test-image-ec2/config.sh
+index 11f758efdd..6a4387b0eb 100644
+--- a/build-tests/x86/suse/test-image-ec2/config.sh
++++ b/build-tests/x86/suse/test-image-ec2/config.sh
+@@ -64,7 +64,7 @@ sed -i 's/#ChallengeResponseAuthentication yes/ChallengeResponseAuthentication n
+ 
+ # Remove the password for root
+ # Note the string matches the password set in the config file
+-sed -i 's/$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0/*/' /etc/shadow
++# sed -i 's/$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0/*/' /etc/shadow
+ 
+ #======================================
+ # Activate services
+diff --git a/build-tests/x86/suse/test-image-gce/config.sh b/build-tests/x86/suse/test-image-gce/config.sh
+index 73ec2c3018..79eafa630a 100644
+--- a/build-tests/x86/suse/test-image-gce/config.sh
++++ b/build-tests/x86/suse/test-image-gce/config.sh
+@@ -72,7 +72,7 @@ sed -i 's/#ChallengeResponseAuthentication yes/ChallengeResponseAuthentication n
+ 
+ # Remove the password for root
+ # Note the string matches the password set in the config file
+-sed -i 's/$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0/*/' /etc/shadow
++# sed -i 's/$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0/*/' /etc/shadow
+ 
+ # Create the boto config file
+ echo  '[Boto]
+diff --git a/build-tests/x86/suse/test-image-qcow-openstack/config.sh b/build-tests/x86/suse/test-image-qcow-openstack/config.sh
+index 07d00c3c52..f381eb7aec 100644
+--- a/build-tests/x86/suse/test-image-qcow-openstack/config.sh
++++ b/build-tests/x86/suse/test-image-qcow-openstack/config.sh
+@@ -51,7 +51,7 @@ sed -i 's/#ChallengeResponseAuthentication yes/ChallengeResponseAuthentication n
+ 
+ # Remove the password for root
+ # Note the string matches the password set in the config file
+-sed -i 's/$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0/*/' /etc/shadow
++# sed -i 's/$1$wYJUgpM5$RXMMeASDc035eX.NbYWFl0/*/' /etc/shadow
+ 
+ # Setup cloud-init for OpenStack
+ echo ""  >> /etc/cloud/cloud.cfg
diff --git a/kiwi.spec b/kiwi.spec
index e59772ea8362d71e3616a30ce27bb204a27f4290..af8e39668c1e145f735f0569d5085bed63b094b9 100644
--- a/kiwi.spec
+++ b/kiwi.spec
@@ -2,12 +2,13 @@
 
 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: 019ccaf292201d5309856dc18ddd1b0ad8f6a70e.patch
 
 BuildRequires:  bash-completion dracut fdupes gcc make
 BuildRequires:  python3-devel python3-setuptools shadow-utils
@@ -189,6 +190,9 @@ done
 %{_mandir}/man8/%{name}*
 
 %changelog
+* 20201109173007659240 patch-tracking 9.21.5-2
+- append patch file of upstream repository from <019ccaf292201d5309856dc18ddd1b0ad8f6a70e> to <019ccaf292201d5309856dc18ddd1b0ad8f6a70e>
+
 * Tue Jul 28 2020 xinghe <xinghe1@huawei.com> - 9.21.5-1
 - update version to 9.21.5
 
@@ -208,4 +212,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