diff --git a/rpm-4.18.0.tar.bz2 b/rpm-4.18.1.tar.bz2
similarity index 46%
rename from rpm-4.18.0.tar.bz2
rename to rpm-4.18.1.tar.bz2
index 37ea9292b836f201a6655a943e4ba7c7e47c2781..812b8c46003e85525da15f345ec3ade1ff5881c7 100644
Binary files a/rpm-4.18.0.tar.bz2 and b/rpm-4.18.1.tar.bz2 differ
diff --git a/rpm-4.18.x-ldflags.patch b/rpm-4.18.x-ldflags.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8f62c4521b9077ee8a4f6304f83435321e848051
--- /dev/null
+++ b/rpm-4.18.x-ldflags.patch
@@ -0,0 +1,16 @@
+diff -up rpm-4.18.1/macros.in.orig rpm-4.18.1/macros.in
+--- rpm-4.18.1/macros.in.orig	2023-03-15 13:57:06.385361527 +0100
++++ rpm-4.18.1/macros.in	2023-03-15 13:58:09.613971713 +0100
+@@ -727,10 +727,11 @@ package or when debugging this package.\
+   RPM_SOURCE_DIR=\"%{_sourcedir}\"\
+   RPM_BUILD_DIR=\"%{_builddir}\"\
+   RPM_OPT_FLAGS=\"%{optflags}\"\
++  RPM_LD_FLAGS=\"%{?build_ldflags}\"\
+   RPM_ARCH=\"%{_arch}\"\
+   RPM_OS=\"%{_os}\"\
+   RPM_BUILD_NCPUS=\"%{_smp_build_ncpus}\"\
+-  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS\
++  export RPM_SOURCE_DIR RPM_BUILD_DIR RPM_OPT_FLAGS RPM_ARCH RPM_OS RPM_BUILD_NCPUS RPM_LD_FLAGS\
+   RPM_DOC_DIR=\"%{_docdir}\"\
+   export RPM_DOC_DIR\
+   RPM_PACKAGE_NAME=\"%{NAME}\"\
diff --git a/rpm-4.18.x-revert-pandoc-cond.patch b/rpm-4.18.x-revert-pandoc-cond.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7b67c9b5cb7ad33748fa1ff0f5e02cf56751e752
--- /dev/null
+++ b/rpm-4.18.x-revert-pandoc-cond.patch
@@ -0,0 +1,12 @@
+diff -up rpm-4.18.1/docs/Makefile.am.orig rpm-4.18.1/docs/Makefile.am
+--- rpm-4.18.1/docs/Makefile.am.orig	2023-03-15 14:48:27.955720807 +0100
++++ rpm-4.18.1/docs/Makefile.am	2023-03-15 14:48:43.634626934 +0100
+@@ -1,8 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-if PANDOC
+ SUBDIRS = man
+-endif
+ 
+ EXTRA_DIST =
+ 
diff --git a/rpm.spec b/rpm.spec
index 8daa893aae513800e6654d35c52c38d3874693c6..27ed95378f7a52bdd3d32b33058a5fcc4ab2a0a1 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -1,4 +1,4 @@
-%define anolis_release 7
+%define anolis_release 1
 %define rpmhome /usr/lib/rpm
 %bcond_with check
 %bcond_without xz
@@ -11,7 +11,7 @@
 %bcond_without sqlite
 %bcond_without bdb_ro
 
-%global rpmver 4.18.0
+%global rpmver 4.18.1
 %global sover 9
 
 %global srcver %{rpmver}
@@ -30,6 +30,10 @@ Source20: rpmdb-migrate.service
 Source21: rpmdb_migrate
 
 Patch0: rpm-4.17.x-rpm_dbpath.patch
+# Promote RPM_LDFLAGS to environment
+Patch1: rpm-4.18.x-ldflags.patch
+# Allow install docs when building without pandoc
+Patch2: rpm-4.18.x-revert-pandoc-cond.patch
 License: GPLv2+
 
 BuildRequires: automake libtool system-rpm-config systemd-rpm-macros make gawk
@@ -342,17 +346,9 @@ done;
 
 %make_build
 
-pushd python
-%py3_build
-popd
-
 %install
 %make_install
 
-pushd python
-%py3_install
-popd
-
 mkdir -p $RPM_BUILD_ROOT%{_unitdir}
 install -m 644 %{SOURCE10} $RPM_BUILD_ROOT/%{_unitdir}
 install -m 644 %{SOURCE20} $RPM_BUILD_ROOT/%{_unitdir}
@@ -379,8 +375,6 @@ ln -s ../../bin/find-debuginfo $RPM_BUILD_ROOT/usr/lib/rpm/find-debuginfo.sh
 
 %find_lang rpm
 
-find $RPM_BUILD_ROOT -name "*.la"|xargs rm -f
-
 rm -f $RPM_BUILD_ROOT/%{rpmhome}/{perldeps.pl,perl.*,pythond*}
 rm -f $RPM_BUILD_ROOT/%{_fileattrsdir}/{perl*,python*}
 rm -rf $RPM_BUILD_ROOT/var/tmp
@@ -598,6 +592,9 @@ fi
 %doc docs/librpm/html/*
 
 %changelog
+* Wed Jul 12 2023 Funda Wang <fundawang@yeah.net> - 4.18.1-1
+- New version 4.18.1
+
 * Thu Apr 13 2023 Zhongling <zhonglingh@linux.alibaba.com> - 4.18.0-7
 - Refactor rpm spec