diff --git a/backport-Use-root-as-default-UID_0_USER-and-UID_0_GROUP.patch b/backport-Use-root-as-default-UID_0_USER-and-UID_0_GROUP.patch
new file mode 100644
index 0000000..80b8790
--- /dev/null
+++ b/backport-Use-root-as-default-UID_0_USER-and-UID_0_GROUP.patch
@@ -0,0 +1,29 @@
+From 7b3a3f004f96ed3cb9cc377f7e64bfc88195dfc2 Mon Dec 13 16:41:34 2021
+From: From: Florian Festi <ffesti@redhat.com>
+Date: Mon, 13 Dec 2021 16:41:34 +0800
+Subject: [PATCH] Use root as default UID_0_USER and UID_0_GROUP
+
+If /etc/passwd or /etc/group was not available during building rpm itself
+these ended up empty. This affects builds done later on using rpmbuild.
+
+Resolves: #1838
+---
+ configure.ac | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index cdaf2b6..8656043 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1050,6 +1050,8 @@ fi
+ 
+ user_with_uid0=$(awk -F: '$3==0 {print $1;exit}' /etc/passwd)
+ group_with_gid0=$(awk -F: '$3==0 {print $1;exit}' /etc/group)
++if test -z "$user_with_uid0" ; then user_with_uid0=root ; fi
++if test -z "$group_with_gid0" ; then group_with_gid0=root ; fi
+ AC_DEFINE_UNQUOTED([UID_0_USER],["$user_with_uid0"],[Get the user name having userid 0])
+ AC_DEFINE_UNQUOTED([GID_0_GROUP],["$group_with_gid0"],[Get the group name having groupid 0])
+ 
+-- 
+1.8.3.1
+
diff --git a/rpm.spec b/rpm.spec
index a31584e..48ae2dc 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,6 +1,6 @@
 Name:          rpm
 Version:       4.15.1
-Release:       34
+Release:       35
 Summary:       RPM Package Manager
 License:       GPLv2+
 URL:           http://www.rpm.org/
@@ -91,6 +91,7 @@ Patch77: backport-0001-CVE-2021-3521.patch
 Patch78: backport-0002-CVE-2021-3521.patch
 Patch79: backport-0003-CVE-2021-3521.patch
 Patch80: rpm-selinux-plugin-check-context-file-exist.patch
+Patch81: backport-Use-root-as-default-UID_0_USER-and-UID_0_GROUP.patch
 
 BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel libdb-devel
 BuildRequires: zlib-devel libzstd-devel xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel
@@ -374,6 +375,12 @@ make check || (cat tests/rpmtests.log; exit 0)
 %{_mandir}/man1/gendiff.1*
 
 %changelog
+* Mon Dec 13 2021 renhongxun<renhongxun@huawei.com> - 4.15.1-35
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:sync patch from github
+
 * Fri Dec 3 2021 luhuaxin<1539327763@qq.com> - 4.15.1-34
 - Type:bugfix
 - ID:NA