diff --git a/src/modules/grub/grub.conf b/src/modules/grub/grub.conf
index 8e98f4d45..dfc8b73ab 100644
--- a/src/modules/grub/grub.conf
+++ b/src/modules/grub/grub.conf
@@ -5,6 +5,7 @@ grubInstall: "grub-install"
 grubMkconfig: "grub-mkconfig"
 grubCfg: "/boot/grub/grub.cfg"
 # Some distributions require a /boot/efi or /boot/EFI directory. Configure as needed.
+# These values need to be in-sync with partition.conf
 efiDirectory: "/boot"
 efiDirectoryFirmware: "/boot/EFI"
 # Optionally set the --bootloader-id to use for EFI. If not set, this defaults
diff --git a/src/modules/partition/gui/EraseDiskPage.cpp b/src/modules/partition/gui/EraseDiskPage.cpp
index 86a1dff3d..31c696aa3 100644
--- a/src/modules/partition/gui/EraseDiskPage.cpp
+++ b/src/modules/partition/gui/EraseDiskPage.cpp
@@ -160,7 +160,7 @@ EraseDiskPage::doAutopartition( Device* dev )
             first_free_sector,
             lastSector
         );
-        PartitionInfo::setMountPoint( efiPartition, "/boot/efi" );
+        PartitionInfo::setMountPoint( efiPartition, "/boot" );
         PartitionInfo::setFormat( efiPartition, true );
         m_core->createPartition( dev, efiPartition );
         first_free_sector = lastSector + 1;
diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf
new file mode 100644
index 000000000..04e93a2fa
--- /dev/null
+++ b/src/modules/partition/partition.conf
@@ -0,0 +1,5 @@
+---
+# Some distributions require a /boot/efi or /boot/EFI directory. Configure as needed.
+# These values need to be in-sync with grub.conf
+efiDirectory: "/boot"
+efiDirectoryFirmware: "/boot/EFI"