diff --git a/debian/changelog b/debian/changelog
index 806465b..086a2d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,9 @@ shim (12+1503074702.5202f80-0ubuntu1~test3) artful; urgency=medium
     target.
   * debian/patches/buildid_write_return.patch: workaround our strict compile
     rules failing the build: make sure write calls check the return value.
+  * debian/rules, debian/shim.install: make sure the 'make install' step does
+    what it's meant to do by upstream: we can easily make use of the end result
+    to have the files we need.
 
  -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Tue, 29 Aug 2017 22:45:30 -0400
 
diff --git a/debian/rules b/debian/rules
index d863ab7..cf79982 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,14 +6,25 @@
 # should be building the other binaries also.
 ifeq ($(shell dpkg-vendor --is ubuntu && echo yes),yes)
 	cert=debian/canonical-uefi-ca.der
+	distributor=ubuntu
 else
 	cert=debian/debian-uefi-ca.der
+	distributor=debian
 endif
 
 ifeq ($(DEB_HOST_ARCH),amd64)
 export EFI_ARCH := x64
 endif
 
+COMMON_OPTIONS = \
+	MAKELEVEL=0 \
+	EFI_PATH=/usr/lib \
+	ENABLE_SHIM_CERT=1 \
+	ENABLE_SBSIGN=1 \
+	VENDOR_CERT_FILE=$(cert) \
+	EFIDIR=$(distributor) \
+	$(NULL)
+
 %:
 	dh $@ --parallel
 
@@ -22,15 +33,10 @@ override_dh_auto_clean:
 	rm -f *.signed
 
 override_dh_auto_build:
-	dh_auto_build -- \
-		MAKELEVEL=0 \
-		EFI_PATH=/usr/lib \
-		ENABLE_SHIM_CERT=1 \
-		ENABLE_SBSIGN=1 \
-		VENDOR_CERT_FILE=$(cert)
+	dh_auto_build -- $(COMMON_OPTIONS)
 
 override_dh_auto_install:
-	dh_auto_install -- MAKELEVEL=0 EFIDIR=ubuntu
+	dh_auto_install --destdir=debian/tmp -- $(COMMON_OPTIONS)
 
 override_dh_fixperms:
 	dh_fixperms
diff --git a/debian/shim.install b/debian/shim.install
index 0f5a04b..268df25 100644
--- a/debian/shim.install
+++ b/debian/shim.install
@@ -1,3 +1,4 @@
-/boot/efi/EFI/ubuntu/shim*.efi /usr/lib/shim
-/boot/efi/EFI/ubuntu/mm*.efi.signed /usr/lib/shim
-/boot/efi/EFI/ubuntu/fb*.efi.signed /usr/lib/shim
+/boot/efi/EFI/*/shim*.efi /usr/lib/shim
+/boot/efi/EFI/*/mm*.efi /usr/lib/shim
+/boot/efi/EFI/*/fb*.efi /usr/lib/shim
+/boot/efi/EFI/*/BOOT*.CSV /usr/lib/shim