diff --git a/install.sh b/install.sh
index 35bf58f..29fd6cc 100755
--- a/install.sh
+++ b/install.sh
@@ -135,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/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
+