diff --git a/auto-config-update-aarch64-ppc64le.diff b/auto-config-update-aarch64-ppc64le.diff
index 907d75f..9020e38 100644
--- a/auto-config-update-aarch64-ppc64le.diff
+++ b/auto-config-update-aarch64-ppc64le.diff
@@ -16,7 +16,7 @@
 +		"for s in guess sub; do\n"
 +		"    for c in $(find -maxdepth 8 -name \"config.$s\"); do\n"
 +		"         grep -q config-patches@ $c || continue\n"
-+		"         grep -q $testarch\\[-:\\] $c || install -m 755 $ref/config.$s $c\n"
++		"         grep -q \"$testarch[-: ]\" $c || install -m 755 $ref/config.$s $c\n"
 +		"     done\n"
 +		"done\n"
 +	    );
diff --git a/rpm.changes b/rpm.changes
index 1d67bc3..5f4d050 100644
--- a/rpm.changes
+++ b/rpm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb  8 09:38:33 UTC 2021 - Andreas Schwab <schwab@suse.de>
+
+- Use shipped config.sub/config.guess instead of stone-aged from libtool
+- auto-config-update-aarch64-ppc64le.diff: update grep regex
+
 -------------------------------------------------------------------
 Thu Jan 14 15:40:39 UTC 2021 - Matej Cepl <mcepl@suse.com>
 
diff --git a/rpm.spec b/rpm.spec
index 73ebfee..d9d500b 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -233,7 +233,6 @@ Provides and requires generator for .pl files and modules.
 %prep
 %setup -q -n rpm-%{version}
 rm -rf sqlite
-cp /usr/share/libtool/build-aux/config.guess /usr/share/libtool/build-aux/config.sub .
 %if 0%{?!without_bdb:1}
 tar xjf %{SOURCE11}
 ln -s db-4.8.30 db
@@ -242,7 +241,7 @@ cd db
 cd ..
 chmod -R u+w db/*
 rm -f rpmdb/db.h
-cp config.guess config.sub db/dist/
+cp build-aux/config.guess build-aux/config.sub db/dist/
 %endif
 %patch5 -p1
 %patch       -P 11 -P 12 -P 13       -P 15 -P 16       -P 18
@@ -369,8 +368,8 @@ for i in /usr/share/automake-*/*; do
 done
 popd
 %ifarch aarch64 ppc64le riscv64
-install -m 755 config.guess %{buildroot}/usr/lib/rpm
-install -m 755 config.sub %{buildroot}/usr/lib/rpm
+install -m 755 build-aux/config.guess %{buildroot}/usr/lib/rpm
+install -m 755 build-aux/config.sub %{buildroot}/usr/lib/rpm
 %endif
 rm -rf %{buildroot}/%{_libdir}/python%{py_ver}
 rm -f %{buildroot}%{_libdir}/*.la