diff --git a/shim.spec b/shim.spec
index 8664d68..0dcf243 100644
--- a/shim.spec
+++ b/shim.spec
@@ -5,7 +5,7 @@
 
 Name:		shim
 Version:	15
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	First-stage UEFI bootloader
 License:	BSD
 URL:		https://github.com/rhboot/shim/
@@ -95,15 +95,18 @@ install -m 0700 %{shimefi} $RPM_BUILD_ROOT%{efi_esp_dir}/shim.efi
   | sed -e 's/\./\^/' -e 's,^\\\./,.*/,' -e 's,$,$,' > %{__brp_mangle_shebangs_exclude_from_file}
 
 %define_files -a %{efi_arch} -A %{efi_arch_upper}
-%if %{efi_has_alt_arch}
-%define_files -a %{efi_alt_arch} -A %{efi_alt_arch_upper}
-%endif
-
 %if %{provide_legacy_shim}
 %{efi_esp_dir}/shim.efi
 %endif
+%if %{efi_has_alt_arch}
+%define_files -a %{efi_alt_arch} -A %{efi_alt_arch_upper}
+%endif
 
 %changelog
+* Tue Oct 02 2018 Peter Jones <pjones@redhat.com> - 15-6
+- Put the legacy shim.efi binary in the right subpackage
+  Resolves: rhbz#1631989
+
 * Fri May 04 2018 Peter Jones <pjones@redhat.com> - 15-5
 - Rework the .spec to use efi-rpm-macros.