diff --git a/etc-letsencrypt.mount b/etc-letsencrypt.mount
index cf5e86b..f89cf05 100644
--- a/etc-letsencrypt.mount
+++ b/etc-letsencrypt.mount
@@ -8,7 +8,6 @@ What=/dev/mapper/lecrypt
 Where=/etc/letsencrypt
 Type=ext4
 Options=rw,relatime
-TimeoutSec=45
 
 [Install]
 WantedBy=default.target
diff --git a/install.sh b/install.sh
index 62ccbb1..044ac2b 100755
--- a/install.sh
+++ b/install.sh
@@ -17,6 +17,10 @@ fi
 
 echo "Copying Systemd units and drop-ins to system directory..."
 $sudo cp $run_directory/etc-letsencrypt.mount /etc/systemd/system/
+if [ ! -d /etc/systemd/systemd-cryptsetup@lecrypt.service.d ]; then
+  $sudo mkdir /etc/systemd/system/systemd-cryptsetup@lecrypt.service.d
+fi
+$sudo cp $run_directory/timeout.conf /etc/systemd/system/systemd-cryptsetup@lecrypt/
 if [ ! -d /etc/systemd/system/nginx.service.d ]; then
   $sudo mkdir /etc/systemd/system/nginx.service.d
 fi
@@ -26,7 +30,7 @@ echo "Reloading Systemd..."
 $sudo systemctl daemon-reload
 echo "Enabling etc-letsencrypt.mount..."
 $sudo systemctl enable etc-letsencrypt.mount
-# WARNING you should enable this mount (and keep nginx.service enabled) if your volume does not unlock automatically
+# WARNING you should enable this mount (and keep nginx.service disabled) if your volume does not unlock automatically
 
 echo "Finished install. Exiting..."
 exit 0
diff --git a/timeout.conf b/timeout.conf
new file mode 100644
index 0000000..8f689e8
--- /dev/null
+++ b/timeout.conf
@@ -0,0 +1,2 @@
+[Unit]
+JobTimeoutSec=30