diff --git a/macros.shim b/macros.shim
index be88a12..c9334b7 100644
--- a/macros.shim
+++ b/macros.shim
@@ -6,22 +6,22 @@
 %global bootcsvaa64 %{expand:%{SOURCE10}}
 %global bootcsvia32 %{expand:%{SOURCE11}}
 %global bootcsvx64 %{expand:%{SOURCE12}}
-%global bootcsvarm %{expand:%{SOURCE13}}
+#%%global bootcsvarm %%{expand:%%{SOURCE13}}
 
 %global shimefiaa64 %{expand:%{SOURCE20}}
 %global shimefiia32 %{expand:%{SOURCE21}}
 %global shimefix64 %{expand:%{SOURCE22}}
-%global shimefiarm %%{expand:%{SOURCE23}
+#%%global shimefiarm %%%%{expand:%%{SOURCE23}
 
 %global shimveraa64 15-1.fc28
 %global shimveria32 15-1.fc28
 %global shimverx64 15-1.fc28
-%global shimverarm 15-1.fc28
+#%%global shimverarm 15-1.fc28
 
 %global shimdiraa64 %{_datadir}/shim/%{shimveraa64}/aa64
 %global shimdiria32 %{_datadir}/shim/%{shimveria32}/ia32
 %global shimdirx64 %{_datadir}/shim/%{shimverx64}/x64
-%global shimdirarm %{_datadir}/shim/%{shimverarm}/arm
+#%%global shimdirarm %%{_datadir}/shim/%%{shimverarm}/arm
 
 %global bootcsv %{expand:%%{bootcsv%{efi_arch}}}
 %global bootcsvalt %{expand:%%{bootcsv%{?efi_alt_arch}}}
diff --git a/shim.spec b/shim.spec
index b48bf88..7c5e7d9 100644
--- a/shim.spec
+++ b/shim.spec
@@ -88,13 +88,7 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
 %define_files -a %{efi_alt_arch} -A %{efi_alt_arch_upper}
 %endif
 
-%ifarch x86_64
-%{efi_esp_dir}/BOOT.CSV
-%{efi_esp_dir}/MokManager.efi
-%{efi_esp_dir}/shim.efi
-%{efi_esp_boot}/fallback.efi
-%endif
-%ifarch aarch64
+%if %{provide_legacy_shim}
 %{efi_esp_dir}/shim.efi
 %endif