diff --git a/debian/changelog b/debian/changelog
index e54306d..147cdbc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ shim (12+1501864225.b586175-0) UNRELEASED; urgency=medium
     - Update dh_auto_build/dh_auto_clean for new upstream options: set
       MAKELEVEL.
     - Set DEFAULT_LOADER; this makes second-stage-path unnecessary.
+    - Define an EFI_ARCH variable, and use that for paths to shim. This
+      makes it possible to build a shim for other architectures than amd64.
   * debian/patches/second-stage-path: dropped.
   * debian/patches/sbsigntool-no-pesign: refreshed.
 
diff --git a/debian/rules b/debian/rules
index e51de0b..7edcae3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,10 @@ else
 	cert=debian/debian-uefi-ca.der
 endif
 
+ifeq ($(DEB_HOST_ARCH),amd64)
+export EFI_ARCH := x64
+endif
+
 %:
 	dh $@ --parallel
 
@@ -19,9 +23,9 @@ override_dh_auto_build:
 	dh_auto_build -- \
 		MAKELEVEL=0 \
 		EFI_PATH=/usr/lib \
-		DEFAULT_LOADER=\\\grubx64.efi \
+		DEFAULT_LOADER=\\\grub$(EFI_ARCH).efi \
 		VENDOR_CERT_FILE=$(cert)
 
 override_dh_fixperms:
 	dh_fixperms
-	chmod a-x debian/shim/usr/lib/shim/shimx64.efi
+	chmod a-x debian/shim/usr/lib/shim/shim$(EFI_ARCH).efi