diff --git a/shim.spec b/shim.spec
index 8c565bb..b260afc 100644
--- a/shim.spec
+++ b/shim.spec
@@ -1,6 +1,6 @@
 Name:           shim
 Version:        0.2
-Release:        3%{?dist}
+Release:        3%{?dist}.pj0
 Summary:        First-stage UEFI bootloader
 
 License:        BSD
@@ -23,7 +23,6 @@ Source2:	http://www.codon.org.uk/~mjg59/mokutil/mokutil-%{mokutilver}.tar.bz2
 Source3:	dbx.esl
 
 Patch0:		0001-Fix-grub-path.patch
-Patch1:		0002-Remove-extraneous-debug-code.patch
 Patch2:		mokutil-correct-moklistrt-size.patch
 
 BuildRequires: gnu-efi git openssl-devel openssl
@@ -78,7 +77,7 @@ MAKEFLAGS=""
 if [ -f "%{SOURCE1}" ]; then
 	MAKEFLAGS="VENDOR_CERT_FILE=%{SOURCE1}"
 fi
-make %{?_smp_mflags} ${MAKEFLAGS}
+make ${MAKEFLAGS} shim.efi MokManager.efi fallback.efi
 cd mokutil-%{mokutilver}
 %configure
 make %{?_smp_mflags}
@@ -90,15 +89,24 @@ rm -rf $RPM_BUILD_ROOT
 install -D -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/shim/
 install -m 0644 shim.efi $RPM_BUILD_ROOT%{_datadir}/shim/shim.efi
 install -m 0644 shim.sig $RPM_BUILD_ROOT%{_datadir}/shim/shim.sig
+install -m 0644 fallback.efi $RPM_BUILD_ROOT%{_datadir}/shim/fallback.efi
 install -D -d -m 0755 $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/
 %pesign -s -i MokManager.efi -o $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/MokManager.efi
 cd mokutil-%{mokutilver}
 make PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot} install
+# now install our .debug files...
+cd ..
+install -D -d -m 0755 $RPM_BUILD_ROOT/usr/lib/debug/%{_datadir}/shim/
+install -m 0644 shim.efi.debug $RPM_BUILD_ROOT/usr/lib/debug/%{_datadir}/shim/shim.efi.debug
+install -m 0644 fallback.efi.debug $RPM_BUILD_ROOT/usr/lib/debug/%{_datadir}/shim/fallback.efi.debug
+install -D -d -m 0755 $RPM_BUILD_ROOT/usr/lib/debug/boot/efi/EFI/%{efidir}/MokManager.efi.debug
 
+%post
 
 %files -n shim-unsigned
 %doc
 %dir %{_datadir}/shim
+%dir /boot/efi/EFI/%{efidir}
 %{_datadir}/shim/*
 /boot/efi/EFI/%{efidir}/MokManager.efi
 /usr/bin/mokutil