diff --git a/bin/setup-server b/bin/setup-server
index dbb395a..bdf71f1 100755
--- a/bin/setup-server
+++ b/bin/setup-server
@@ -21,13 +21,19 @@ if [ -z "$IP" ]; then
     IP=$HOST
 fi
 
-echo Adding server to .ssh/config...
-cat >> ~/.ssh/config <<EOF
+grep "Host $HOST" ~/.ssh/config 2>&1 > /dev/null
 
+if [ 0 -eq $? ]; then
+    echo $HOST is already in .ssh/config
+else
+    echo Adding server to .ssh/config...
+    cat >> ~/.ssh/config <<END_OF_HOST
 Host $HOST
     HostName $IP
     User     $USER
-EOF
+END_OF_HOST
+
+fi
 
 echo Copying .ssh directory to $USER@$HOST...
 scp -qr $HOME/.ssh/ $HOST: