diff --git a/rust-buildbot-slave-stunnel.conf b/rust-buildbot-slave-stunnel.conf
index 68225cb..892a7e0 100644
--- a/rust-buildbot-slave-stunnel.conf
+++ b/rust-buildbot-slave-stunnel.conf
@@ -3,6 +3,5 @@ pid =
 [9987]
 client = yes
 accept = 127.0.0.1:9987
-connect = 10.22.112.51:9988
 cafile = ./rust-bot-cert.pem
-verify = 3
\ No newline at end of file
+verify = 3
diff --git a/setup-slave.sh b/setup-slave.sh
index 9e3b2d8..ba40ce3 100755
--- a/setup-slave.sh
+++ b/setup-slave.sh
@@ -2,8 +2,10 @@
 
 if hostname | grep -q '^ip-'
 then
+        # Some images take time for the user data to appear
+        sleep 1
 	echo "Guessing we are on EC2, reading user-data"
-	read SLAVENAME PASSWORD <<EOF
+	read SLAVENAME PASSWORD MASTER_ADDY <<EOF
 `curl -s http://169.254.169.254/latest/user-data`
 EOF
 else
@@ -11,6 +13,8 @@ else
 	read SLAVENAME
 	echo "Enter slave password: "
 	read PASSWORD
+	echo "Enter master address: "
+	read MASTER_ADDY
 fi
 
 rm -f slave/buildbot.tac* slave/twistd.* slave/info/admin slave/info/host
@@ -19,6 +23,9 @@ buildslave create-slave --force slave localhost:9987 "${SLAVENAME:?}" "${PASSWOR
 echo "admin@rust-lang.org" >slave/info/admin
 echo $HOSTNAME >slave/info/host
 
+cp rust-buildbot-slave-stunnel.conf rust-buildbot-slave-stunnel-final.conf
+echo "connect = ${MASTER_ADDY:?}" >> rust-buildbot-slave-stunnel-final.conf
+
 case $MACHTYPE in
 	*-msys)
 				# service will start via service console
@@ -29,7 +36,7 @@ case $MACHTYPE in
 		do
 			if which $s
 			then
-				$s rust-buildbot-slave-stunnel.conf || echo "stunnel startup failed, already running?"
+				$s rust-buildbot-slave-stunnel-final.conf || echo "stunnel startup failed, already running?"
 			fi
 		done
 		echo "starting slave..."