diff --git a/install.sh b/install.sh
index 98d360d..29fd6cc 100755
--- a/install.sh
+++ b/install.sh
@@ -89,7 +89,6 @@ install_exec make-automaps/make-automaps                 "$DESTDIR$usr_sbindir/m
 install_data misc_systemd_units/automount.service        "$DESTDIR$systemdunitdir/automount.service"
 install_data misc_systemd_units/enable_overcommit_memory.service "$DESTDIR$systemdunitdir/enable_overcommit_memory.service"
 install_data misc_systemd_units/gdm.service              "$DESTDIR$systemdunitdir/gdm.service"
-install_data misc_systemd_units/lazy-umount-nfs.service  "$DESTDIR$systemdunitdir/lazy-umount-nfs.service"
 install_data misc_systemd_units/unbound.service          "$DESTDIR$systemdunitdir/unbound.service"
 install_exec mkmotd/mkmotd.pl                            "$DESTDIR$usr_sbindir/mkmotd.pl"
 install_data mkmotd/motd.service                         "$DESTDIR$systemdunitdir/motd.service"
@@ -136,4 +135,7 @@ install_exec nfsdtop/nfsdtop                             "$DESTDIR$usr_sbindir/n
 install_data serial-log/serial-log\@.service             "$DESTDIR$systemdunitdir/serial-log@.service"
 install_exec serial-log/serial-log                       "$DESTDIR$usr_exec_prefix/libexec/serial-log"
 install_data misc_systemd_units/nfsd.service             "$DESTDIR$systemdunitdir/nfsd.service"
+mkdir -p $DESTDIR$systemdunitdir/user@.service.d
+install_data misc_systemd_units/user@.service.d/depend-on-remote-homes.conf \
+                                                          "$DESTDIR$systemdunitdir/user@.service.d/depend-on-remote-homes.conf"
 exit
diff --git a/misc_systemd_units/lazy-umount-nfs.service b/misc_systemd_units/lazy-umount-nfs.service
deleted file mode 100644
index 6a386d1..0000000
--- a/misc_systemd_units/lazy-umount-nfs.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Lazy Umount NFS
-Before=shutdown.target
-After=automount.service
-DefaultDependencies=false
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/umount -a -t nfs4
-ExecStart=/bin/umount -a -t nfs4 -l
-
-[Install]
-WantedBy=shutdown.target
diff --git a/misc_systemd_units/user@.service.d/depend-on-remote-homes.conf b/misc_systemd_units/user@.service.d/depend-on-remote-homes.conf
new file mode 100644
index 0000000..0fa9a1d
--- /dev/null
+++ b/misc_systemd_units/user@.service.d/depend-on-remote-homes.conf
@@ -0,0 +1,7 @@
+# We need access to /home/$USER when we shut down
+# the systemd user instances.
+
+[Unit]
+After=automount.service
+After=remote-fs.target
+