diff --git a/src/systemd/mapper-wait@.service.in b/src/systemd/mapper-wait@.service.in
new file mode 100644
index 0000000..a3df21f
--- /dev/null
+++ b/src/systemd/mapper-wait@.service.in
@@ -0,0 +1,9 @@
+[Unit]
+Description=Wait for %I
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+Restart=on-failure
+TimeoutStartSec=infinity
+ExecStart=@BINDIR@/mapper wait %I