diff --git a/src/freedombone-client b/src/freedombone-client
index 79630c76..08d6eff3 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -99,14 +99,17 @@ 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
+	if [ ! -d ~/.ssh ]; then
+		mkdir ~/.ssh
+	fi
+	echo 'Host *.onion' > ~/.ssh/config
+	echo '  ServerAliveInterval 60' >> ~/.ssh/config
+	echo '  ServerAliveCountMax 3' >> ~/.ssh/config
+	echo "  ProxyCommand sh -c 'monkeysphere ssh-proxycommand --no-connect %h %p ; connect -R remote -5 -S 127.0.0.1:9050 %h %p'" >> ~/.ssh/config
+	echo 'Host *' >> ~/.ssh/config
+	echo '  ServerAliveInterval 60' >> ~/.ssh/config
+	echo '  ServerAliveCountMax 3' >> ~/.ssh/config
+	echo '  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'