diff --git a/Makefile.am b/Makefile.am
index 3168066ef..27ef8e34a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -57,6 +57,7 @@ DISTCHECK_CONFIGURE_FLAGS =				\
 	--enable-uefi					\
 	--enable-dell					\
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
+	--with-bootdir=$$dc_install_base/$(bootdir) \
 	--with-systemdunitdir=$$dc_install_base/$(systemdunitdir)
 
 GITIGNOREFILES =					\
diff --git a/configure.ac b/configure.ac
index 5446f76ba..48bfeaa93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,6 +335,13 @@ AC_ARG_WITH([systemdunitdir],
             [with_systemdunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
 AC_SUBST([systemdunitdir], [$with_systemdunitdir])
 
+# EFI system partition location
+AC_ARG_WITH([bootdir],
+            AS_HELP_STRING([--with-bootdir=DIR], [Directory for EFI system partition]),
+            [],
+            [with_bootdir=/boot/efi])
+AC_SUBST([bootdir], [$with_bootdir])
+
 # udev rules
 AC_ARG_WITH([udevrulesdir],
             AS_HELP_STRING([--with-udevrulesdir=DIR], [Directory for udev rules files]),
diff --git a/data/Makefile.am b/data/Makefile.am
index 6446683a2..af5eb1bb1 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -19,6 +19,7 @@ $(dbusservicemain_DATA): $(dbusservicemain_in_files) Makefile
 %.service: %.service.in Makefile
 	$(AM_V_GEN)sed -e 's|\@servicedir\@|$(libexecdir)|' \
 	               -e 's|\@localstatedir\@|$(localstatedir)|' \
+	               -e 's|\@bootdir\@|$(bootdir)|' \
 	               -e 's|\@bindir\@|$(bindir)|' \
 	               -e 's|\@daemon_user\@|$(daemon_user)|' $< > $@.tmp && mv $@.tmp $@
 
diff --git a/data/fwupd.service.in b/data/fwupd.service.in
index 13041f8a0..a754f93a6 100644
--- a/data/fwupd.service.in
+++ b/data/fwupd.service.in
@@ -16,4 +16,4 @@ ProtectKernelModules=yes
 ProtectSystem=full
 RestrictAddressFamilies=AF_NETLINK AF_UNIX
 RestrictRealtime=yes
-ReadWritePaths=@localstatedir@/lib/fwupd /boot/efi
+ReadWritePaths=@localstatedir@/lib/fwupd @bootdir@