diff --git a/setup/build_environment.py b/setup/build_environment.py
index d4a7af833b..eb34763fb4 100644
--- a/setup/build_environment.py
+++ b/setup/build_environment.py
@@ -225,7 +225,10 @@ except:
     try:
         HOST=get_ip_address('wlan0')
     except:
-        HOST='192.168.1.2'
+        try:
+            HOST=get_ip_address('ppp0')
+        except:
+            HOST='192.168.1.2'
 
 PROJECT=os.path.basename(os.path.abspath('.'))
 
diff --git a/setup/installer/__init__.py b/setup/installer/__init__.py
index 79bb942cde..8374f93e38 100644
--- a/setup/installer/__init__.py
+++ b/setup/installer/__init__.py
@@ -20,17 +20,23 @@ for x in [
     EXCLUDES.extend(['--exclude', x])
 SAFE_EXCLUDES = ['"%s"'%x if '*' in x else x for x in EXCLUDES]
 
+def get_rsync_pw():
+    return open('/home/kovid/work/kde/conf/buildbot').read().partition(
+                ':')[-1].strip()
+
 class Rsync(Command):
 
     description = 'Sync source tree from development machine'
 
     SYNC_CMD = ' '.join(BASE_RSYNC+SAFE_EXCLUDES+
-            ['rsync://{host}/work/{project}', '..'])
+            ['rsync://buildbot@{host}/work/{project}', '..'])
 
     def run(self, opts):
         cmd = self.SYNC_CMD.format(host=HOST, project=PROJECT)
+        env = dict(os.environ)
+        env['RSYNC_PASSWORD'] = get_rsync_pw()
         self.info(cmd)
-        subprocess.check_call(cmd, shell=True)
+        subprocess.check_call(cmd, shell=True, env=env)
 
 
 class Push(Command):
@@ -81,7 +87,8 @@ class VMInstaller(Command):
 
 
     def get_build_script(self):
-        ans = '\n'.join(self.BUILD_PREFIX)+'\n\n'
+        rs = ['export RSYNC_PASSWORD=%s'%get_rsync_pw()]
+        ans = '\n'.join(self.BUILD_PREFIX + rs)+'\n\n'
         ans += ' && \\\n'.join(self.BUILD_RSYNC) + ' && \\\n'
         ans += ' && \\\n'.join(self.BUILD_CLEAN) + ' && \\\n'
         ans += ' && \\\n'.join(self.BUILD_BUILD) + ' && \\\n'