diff --git a/build.py b/build.py
index 09112781..df9ff454 100755
--- a/build.py
+++ b/build.py
@@ -2160,6 +2160,14 @@ def cmd_setrev(options, args):
     msg('cfg.VERSION: %s' % cfg.VERSION)
 
 
+def cmd_setpythonpath(options, args):
+    cmdTimer = CommandTimer('setpythonpath')
+    assert os.getcwd() == phoenixDir()
+
+    sys.path.insert(0, phoenixDir())
+    os.environ['PYTHONPATH'] = phoenixDir()
+
+
 
 #---------------------------------------------------------------------------
 
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index ff8288eb..a96eb7be 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -122,17 +122,14 @@ c['schedulers'].append( Nightly(
                             hour=1, minute=15,
                             onlyIfChanged=True,
                             builderNames=["dist-osx-py27",
-                                          "dist-osx-py34",
                                           "dist-osx-py35",
                                           "dist-osx-py36",
                                           "dist-osx-py37",
                                           "dist-win32-py27",
-                                          "dist-win32-py34",
                                           "dist-win32-py35",
                                           "dist-win32-py36",
                                           "dist-win32-py37",
                                           "dist-win64-py27",
-                                          "dist-win64-py34",
                                           "dist-win64-py35",
                                           "dist-win64-py36",
                                           "dist-win64-py37",
@@ -181,17 +178,14 @@ c['schedulers'].append( ForceScheduler(
                                           "build-gtk3-py36",
                                           "build-gtk3-py37",
                                           "dist-osx-py27",
-                                          "dist-osx-py34",
                                           "dist-osx-py35",
                                           "dist-osx-py36",
                                           "dist-osx-py37",
                                           "dist-win32-py27",
-                                          "dist-win32-py34",
                                           "dist-win32-py35",
                                           "dist-win32-py36",
                                           "dist-win32-py37",
                                           "dist-win64-py27",
-                                          "dist-win64-py34",
                                           "dist-win64-py35",
                                           "dist-win64-py36",
                                           "dist-win64-py37",
@@ -271,11 +265,11 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
                         mode=mode, method=method))
 
     if buildType == 'sdist':
-        cmd = 'python -u build.py %s setrev dox touch etg sip build '\
+        cmd = 'python -u build.py %s setrev setpythonpath dox touch etg sip build '\
               'wxlib sdist sdist_demo --upload' % pyVer
 
     elif buildType == 'docs':
-        cmd = 'python -u build.py %s setrev dox touch etg sip build wxlib ' \
+        cmd = 'python -u build.py %s setrev setpythonpath dox touch etg sip build wxlib ' \
               'sphinx bdist_docs --upload' % pyVer
 
     elif buildType == 'vagrant':
@@ -395,11 +389,11 @@ c['builders'] = [
 
         BuilderConfig(name="dist-docs",
                       slavenames=["win7-py27"],
-                      factory=makeFactory('', 'docs')),
+                      factory=makeFactory('', 'docs', pyVer='3.7')),
 
         BuilderConfig(name="dist-src",
                       slavenames=["ubuntu-x64_86-py27"],
-                      factory=makeFactory('', 'sdist')),
+                      factory=makeFactory('', 'sdist', pyVer='3.7')),
 
 
 
@@ -407,10 +401,6 @@ c['builders'] = [
                       slavenames=["macosx-vm6"],
                       factory=makeFactory('osx', 'dist')),
 
-        BuilderConfig(name="dist-osx-py34",
-                      slavenames=["macosx-vm6"],
-                      factory=makeFactory('osx', 'dist', pyVer='3.4')),
-
         BuilderConfig(name="dist-osx-py35",
             slavenames=["macosx-vm6"],
             factory=makeFactory('osx', 'dist', pyVer='3.5')),
@@ -428,10 +418,6 @@ c['builders'] = [
                       slavenames=["win7-py27"],
                       factory=makeFactory('win32', 'dist', pyVer='2.7')),
 
-        BuilderConfig(name="dist-win32-py34",
-                      slavenames=["win7-py27"],
-                      factory=makeFactory('win32', 'dist', pyVer='3.4')),
-
         BuilderConfig(name="dist-win32-py35",
                       slavenames=["win7-py27"],
                       factory=makeFactory('win32', 'dist', pyVer='3.5')),
@@ -448,10 +434,6 @@ c['builders'] = [
                       slavenames=["win7-py27"],
                       factory=makeFactory('win64', 'dist', pyVer='2.7')),
 
-        BuilderConfig(name="dist-win64-py34",
-                      slavenames=["win7-py27"],
-                      factory=makeFactory('win64', 'dist', pyVer='3.4')),
-
         BuilderConfig(name="dist-win64-py35",
                       slavenames=["win7-py27"],
                       factory=makeFactory('win64', 'dist', pyVer='3.5')),