diff --git a/macros.shim b/shim.rpmmacros
similarity index 88%
rename from macros.shim
rename to shim.rpmmacros
index c9334b7..0747e6f 100644
--- a/macros.shim
+++ b/shim.rpmmacros
@@ -23,21 +23,21 @@
 %global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64
 #%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm
 
-%global bootcsv %{expand:%%{bootcsv%{efi_arch}}}
-%global bootcsvalt %{expand:%%{bootcsv%{?efi_alt_arch}}}
-%global shimefi %{expand:%%{shimefi%{efi_arch}}}
-%global shimefialt %{expand:%%{shimefi%{?efi_alt_arch}}}
-%global shimver %{expand:%%{shimver%{efi_arch}}}
-%global shimveralt %{expand:%%{shimver%{?efi_alt_arch}}}
-%global shimdir %{expand:%%{shimdir%{efi_arch}}}
-%global shimdiralt %{expand:%%{shimdir%{?efi_alt_arch}}}
+%{expand:
+%%global bootcsv %%{expand:%%{bootcsv%%{efi_arch}}}
+%%global bootcsvalt %%{expand:%%{bootcsv%%{?efi_alt_arch}}}
+%%global shimefi %%{expand:%%{shimefi%%{efi_arch}}}
+%%global shimefialt %%{expand:%%{shimefi%%{?efi_alt_arch}}}
+%%global shimver %%{expand:%%{shimver%%{efi_arch}}}
+%%global shimveralt %%{expand:%%{shimver%%{?efi_alt_arch}}}
+%%global shimdir %%{expand:%%{shimdir%%{efi_arch}}}
+%%global shimdiralt %%{expand:%%{shimdir%%{?efi_alt_arch}}}
 
-%ifarch aarch64
-%global unsigned shim-unsigned-aarch64
-%else
-%global unsigned shim-unsigned-%{efi_arch}
-%endif
-%global unsignedalt shim-unsigned-%{?efi_alt_arch}
+%%global unsigned%{efi_arch} %{efi_arch}
+%%global unsignedaa64 aarch64
+%%global unsigned shim-unsigned-%%{expand:%%{unsigned%{efi_arch}}}
+%%global unsignedalt shim-unsigned-%{?efi_alt_arch}
+}
 
 %define define_pkg(a:p:)						\
 %{expand:%%package -n shim-%{-a*}}					\
diff --git a/shim.spec b/shim.spec
index 7c5e7d9..0967a81 100644
--- a/shim.spec
+++ b/shim.spec
@@ -18,7 +18,7 @@ ExcludeArch:	%{ix86}
 # and we don't have shim-unsigned-arm builds yet
 ExcludeArch:	%{arm}
 
-Source0:	macros.shim
+Source0:	shim.rpmmacros
 
 # keep these two lists of sources synched up arch-wise.  That is 0 and 10
 # match, 1 and 11 match, ...