diff --git a/rpm.spec b/rpm.spec
index 73763b4..5fad8a5 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -137,11 +137,6 @@ Patch79:        helperenv.diff
 Patch80:        config-guess-sub-update.diff
 Patch81:        debugedit-aarch64.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%ifarch aarch64
-%global auto_config_guess_update 1
-%else
-%global auto_config_guess_update 0
-%endif
 #
 # avoid bootstrapping problem
 %define _binary_payload w9.bzdio
@@ -229,8 +224,8 @@ rm -f rpmdb/db.h
 %patch -P 60 -P 61 -P 62 -P 63 -P 64 -P 65 -P 66 -P 67 -P 68 -P 69
 %patch -P 70 -P 71 -P 72 -P 73 -P 74 -P 75 -P 76 -P 77 -P 78 -P 79
 %patch -P 80 -P 81
-%if %auto_config_guess_update
-patch -p0 < %{S:6464}
+%ifarch aarch64
+%patch6464
 %endif
 cp config.guess config.sub db/dist/
 cp config.guess config.sub beecrypt/
@@ -348,7 +343,7 @@ for i in /usr/share/automake-*/*; do
   fi
 done
 popd
-%if %auto_config_guess_update
+%ifarch aarch64
 install -m 755 config.guess %{buildroot}/usr/lib/rpm
 install -m 755 config.sub %{buildroot}/usr/lib/rpm
 %endif