diff --git a/src/freedombone-client b/src/freedombone-client
index 123419bf..79630c76 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -99,6 +99,15 @@ function configure_ssh_client {
 
 	ssh_remove_small_moduli
 
+	echo 'Host *.onion
+	ServerAliveInterval 60
+	ServerAliveCountMax 3
+	ProxyCommand sh -c 'monkeysphere ssh-proxycommand --no-connect %h %p ; connect -R remote -5 -S 127.0.0.1:9050 %h %p'
+Host *
+	ServerAliveInterval 60
+	ServerAliveCountMax 3
+	ProxyCommand monkeysphere ssh-proxycommand %h %p' > ~/.ssh/config
+
 	echo ''
 	echo $'Copy the following into a file called /home/username/.ssh/authorized_keys on the Freedombone server'
 	echo ''
@@ -108,7 +117,7 @@ function configure_ssh_client {
 }
 
 function configure_monkeysphere {
-	sudo apt-get -y install monkeysphere
+	sudo apt-get -y install tor connect-proxy monkeysphere
 }
 
 function show_help {