diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index aab9c7ca..2f5d4ef7 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -46,6 +46,10 @@ c['slaves'] = [#BuildSlave("osx-10.7-vm-py2.7", bbpasswd.PASSWD1,
                 #BuildSlave("osx_10.6-py27", bbpasswd.PASSWD1,
                 #           notify_on_missing='robin@alldunn.com',
                 #           max_builds=1),
+
+                BuildSlave('vagrant-bldr', bbpasswd.PASSWD1,
+                           notify_on_missing='robin@alldunn.com',
+                           max_builds=1),
                 ]
 
 # 'slavePortnum' defines the TCP port to listen on for connections from slaves.
@@ -137,6 +141,12 @@ c['schedulers'].append( Nightly(
                             onlyIfChanged=True,
                             builderNames=["bdist-src"]))
 
+c['schedulers'].append( Nightly(
+                            name="sched-vagrant",
+                            branch=phoenixGitBranch,
+                            hour=1, minute=10,
+                            onlyIfChanged=True,
+                            builderNames=["vagrant-bldr"]))
 
 c['schedulers'].append( ForceScheduler(
                             name='sched-force',
@@ -166,6 +176,7 @@ c['schedulers'].append( ForceScheduler(
                                           "dist-win64-py35",
                                           "bdist-docs",
                                           "bdist-src",
+                                          "vagrant-bldr",
                                           ]))
 
 
@@ -213,7 +224,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
     clean = ''
 
     # Start from a clean build tree for the daily "dist" builds
-    if buildType in ['dist', 'docs']:
+    if buildType in ['dist', 'docs', 'vagrant']:
         mode = 'full'
         method = 'clobber'
 
@@ -237,6 +248,10 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
     elif buildType == 'docs':
         cmd = 'python -u build.py %s setrev dox touch etg sip build wxlib ' \
               'sphinx bdist_docs --upload' % pyVer
+
+    elif buildType == 'vagrant':
+        cmd = 'python -u build.py setrev dox etg --nodoc sip sdist build_vagrant --upload'
+
     else:
         cmd = 'python -u build.py %s %s setrev dox touch etg --nodoc sip build' % (pyVer, clean)
         if port == 'osx':
@@ -378,6 +393,10 @@ c['builders'] = [
                       slavenames=["win7-py27"],
                       factory=makeFactory('win64', 'dist', pyVer='3.5')),
 
+
+        BuilderConfig(name="vagrant-bldr",
+                      slavenames=["vagrant-bldr"],
+                      factory=makeFactory('osx', 'vagrant')),
         ]