diff --git a/data/clr-boot-manager-mount-boot.service.in b/data/clr-boot-manager-mount-boot.service.in
new file mode 100644
index 00000000..c82e4414
--- /dev/null
+++ b/data/clr-boot-manager-mount-boot.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=mount @BOOTDIR@ using clr-boot-manager
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=@BINDIR@/clr-boot-manager mount-boot
+ExecStop=@BINDIR@/umount @BOOTDIR@
+
+[Install]
+WantedBy=multi-user.target
diff --git a/data/meson.build b/data/meson.build
index e14f45a4..3a4f15ea 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,6 +1,7 @@
 # Write systemd unit
 data_conf = configuration_data()
 data_conf.set('BINDIR', path_bindir)
+data_conf.set('BOOTDIR', with_boot_dir)
 
 configure_file(
     input: 'clr-boot-manager-booted.service.in',
@@ -8,3 +9,10 @@ configure_file(
     configuration: data_conf,
     install_dir: with_systemd_system_unit_dir,
 )
+
+configure_file(
+    input: 'clr-boot-manager-mount-boot.service.in',
+    output: 'clr-boot-manager-mount-boot.service',
+    configuration: data_conf,
+    install_dir: with_systemd_system_unit_dir,
+)