diff --git a/install.sh b/install.sh
index 7944e05f..223028a5 100755
--- a/install.sh
+++ b/install.sh
@@ -253,6 +253,7 @@ install_data pdist/pdistd@.service                        "$DESTDIR$systemdunitd
 install_exec pdist/pdist-bootcheck                        "$DESTDIR$usr_exec_prefix/libexec/pdist-bootcheck"
 install_data pdist/pdist-bootcheck.service                "$DESTDIR$systemdunitdir/pdist-bootcheck.service"
 install_exec wakeonlan/wake                               "$DESTDIR$usr_bindir/wake"
+install_data make-automaps/make-automaps.service          "$DESTDIR$systemdunitdir/make-automaps.service"
 
 postinstall
 exit
diff --git a/make-automaps/make-automaps.service b/make-automaps/make-automaps.service
new file mode 100644
index 00000000..b88951f1
--- /dev/null
+++ b/make-automaps/make-automaps.service
@@ -0,0 +1,12 @@
+[Unit]
+DefaultDependencies=no
+After=systemd-remount-fs.service
+ConditionPathExists=!/etc/automount/auto.scratch
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/sbin/make-automaps
+
+[Install]
+WantedBy=basic.target