diff --git a/bin/start b/bin/start
index b15475c..335544c 100755
--- a/bin/start
+++ b/bin/start
@@ -1,5 +1,5 @@
 #!/bin/sh
-PATH="$HOME/java/bin/:$HOME/tmux/bin/:$PATH"
+PATH="$HOME/autossh/bin/:$HOME/java/bin/:$HOME/tmux/bin/:$PATH"
 
 echo "$REMOTE_KEY" > .ssh/remote
 echo "$SYNC_KEY" > .ssh/id_rsa
diff --git a/script/remote b/script/remote
index 6ccd1c2..6150d9d 100755
--- a/script/remote
+++ b/script/remote
@@ -1,5 +1,3 @@
 #!/bin/sh
-while true; do
-	ssh -i ~/.ssh/remote -o StrictHostKeyChecking=no -o ExitOnForwardFailure=yes -o StreamLocalBindUnlink=yes -c aes128-ctr -C -S none -N -T -R 53950:localhost:25565 -p 53940 remote@play.kaboom.pw
-	sleep 1
-done
+export AUTOSSH_POLL=30
+autossh -M 53941 -i ~/.ssh/remote -o StrictHostKeyChecking=no -o ExitOnForwardFailure=yes -o StreamLocalBindUnlink=yes -c aes128-ctr -C -S none -N -T -R 53950:localhost:25565 -p 53940 remote@play.kaboom.pw