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..c07034de
--- /dev/null
+++ b/data/clr-boot-manager-mount-boot.service.in
@@ -0,0 +1,11 @@
+[Unit]
+Description=mount /boot using clr-boot-manager
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=@BINDIR@/clr-boot-manager mount-boot
+ExecStop=@BINDIR@/umount /boot
+
+[Install]
+WantedBy=multi-user.target
diff --git a/data/meson.build b/data/meson.build
index e14f45a4..88309709 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -8,3 +8,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,
+)