diff --git a/2078f987ef23d8c8f69b903d1a3f8b25156658e0.patch b/2078f987ef23d8c8f69b903d1a3f8b25156658e0.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b615ccfab9d1cdb5aa5b04280997d91a0cc4ce35
--- /dev/null
+++ b/2078f987ef23d8c8f69b903d1a3f8b25156658e0.patch
@@ -0,0 +1,51 @@
+diff --git a/kiwi/bootloader/config/grub2.py b/kiwi/bootloader/config/grub2.py
+index 7573c31e2f..c826c9099f 100644
+--- a/kiwi/bootloader/config/grub2.py
++++ b/kiwi/bootloader/config/grub2.py
+@@ -1159,9 +1159,9 @@ def _fix_grub_root_device_reference(self, config_file, boot_options):
+                     # grub mkconfig root= settings and replaces it with a
+                     # correct value
+                     # 1. root=LOCAL-KIWI-MAPPED-DEVICE
+-                    # 2. root=.*(lazy)=ANY-LINUX-BY-ID-VALUE
++                    # 2. root=[a-zA-Z]=ANY-LINUX-BY-ID-VALUE
+                     grub_config = re.sub(
+-                        r'(root=.*?=[a-zA-Z0-9:\.-]+)|(root={0})'.format(
++                        r'(root=[a-zA-Z]+=[a-zA-Z0-9:\.-]+)|(root={0})'.format(
+                             boot_options.get('root_device')
+                         ),
+                         '{0}'.format(self.root_reference),
+diff --git a/test/unit/bootloader/config/grub2_test.py b/test/unit/bootloader/config/grub2_test.py
+index 775ad6f1f7..bf5d398141 100644
+--- a/test/unit/bootloader/config/grub2_test.py
++++ b/test/unit/bootloader/config/grub2_test.py
+@@ -664,7 +664,9 @@ def open_file(filename, mode=None):
+             file_handle_grubenv = \
+                 mock_open_grubenv.return_value.__enter__.return_value
+ 
+-            file_handle_grub.read.return_value = 'root=PARTUUID=xx'
++            file_handle_grub.read.return_value = \
++                'root=rootdev nomodeset console=ttyS0 console=tty0\n' \
++                'root=PARTUUID=xx'
+             file_handle_grubenv.read.return_value = 'root=rootdev'
+             file_handle_menu.read.return_value = 'options foo bar'
+ 
+@@ -698,9 +700,17 @@ def open_file(filename, mode=None):
+                     '    fi\n'
+                     'fi\n'
+                 ),
+-                call('root=PARTUUID=xx'),
++                call(
++                    'root=rootdev nomodeset console=ttyS0 console=tty0'
++                    '\n'
++                    'root=PARTUUID=xx'
++                ),
+                 # second write of grub.cfg, setting overlay root
+-                call('root=overlay:UUID=ID')
++                call(
++                    'root=overlay:UUID=ID nomodeset console=ttyS0 console=tty0'
++                    '\n'
++                    'root=overlay:UUID=ID'
++                )
+             ]
+             file_handle_grubenv.write.assert_called_once_with(
+                 'root=overlay:UUID=ID'
diff --git a/f26725f79b26d0f1c96e23488ce2ba0623eb5994.patch b/f26725f79b26d0f1c96e23488ce2ba0623eb5994.patch
new file mode 100644
index 0000000000000000000000000000000000000000..cc9c8e1a1d0c032fcaad389e273af366908522af
--- /dev/null
+++ b/f26725f79b26d0f1c96e23488ce2ba0623eb5994.patch
@@ -0,0 +1,35 @@
+diff --git a/.bumpversion.cfg b/.bumpversion.cfg
+index 465fad23cc..d3c92250b8 100644
+--- a/.bumpversion.cfg
++++ b/.bumpversion.cfg
+@@ -1,5 +1,5 @@
+ [bumpversion]
+-current_version = 9.21.20
++current_version = 9.21.21
+ commit = True
+ tag = True
+ 
+diff --git a/doc/source/conf.py b/doc/source/conf.py
+index 999e9e2e33..1d0689ee7c 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.20'
++version = '9.21.21'
+ # The full version, including alpha/beta/rc tags.
+ release = version
+ 
+diff --git a/kiwi/version.py b/kiwi/version.py
+index 8186ba28e2..8534258233 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.20'
++__version__ = '9.21.21'
+ __githash__ = '$Format:%H$'
diff --git a/kiwi.spec b/kiwi.spec
index e59772ea8362d71e3616a30ce27bb204a27f4290..dbb958c09492c6fe0faf24e3ab2983951038a692 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: 2078f987ef23d8c8f69b903d1a3f8b25156658e0.patch
+Patch6001: f26725f79b26d0f1c96e23488ce2ba0623eb5994.patch
 
 BuildRequires:  bash-completion dracut fdupes gcc make
 BuildRequires:  python3-devel python3-setuptools shadow-utils
@@ -189,6 +191,9 @@ done
 %{_mandir}/man8/%{name}*
 
 %changelog
+* 20201104233007664460 patch-tracking 9.21.5-2
+- append patch file of upstream repository from <2078f987ef23d8c8f69b903d1a3f8b25156658e0> to <f26725f79b26d0f1c96e23488ce2ba0623eb5994>
+
 * 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