diff --git a/src/modules/grub/grub.conf b/src/modules/grub/grub.conf
index ffef6f62e..800360ae4 100644
--- a/src/modules/grub/grub.conf
+++ b/src/modules/grub/grub.conf
@@ -4,6 +4,8 @@
 grubInstall: "grub-install"
 grubMkconfig: "grub-mkconfig"
 grubCfg: "/boot/grub/grub.cfg"
+# While some distributions require a /boot/efi or /boot/EFI directory, Arch does not.
+efiDirectory: "/boot"
 # Optionally set the --bootloader-id to use for EFI. If not set, this defaults
 # to the bootloaderEntryName from branding.desc with problematic characters
 # replaced. If an efiBootloaderId is specified here, it is taken to already be a
diff --git a/src/modules/grub/main.py b/src/modules/grub/main.py
index 68510fbb2..88c4a06d0 100644
--- a/src/modules/grub/main.py
+++ b/src/modules/grub/main.py
@@ -26,7 +26,7 @@ from libcalamares.utils import check_chroot_call
 
 def install_grub(boot_loader, fw_type):
     if fw_type == 'efi':
-        efi_directory = "/boot/efi"
+        efi_directory = libcalamares.job.configuration["efiDirectory"]
         chroot_call(["mkdir", "-p", "{!s}".format(efi_directory)])
         if "efiBootloaderId" in libcalamares.job.configuration:
             efi_bootloader_id = libcalamares.job.configuration["efiBootloaderId"]