diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 1a340fc9..0377cf97 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -77,10 +77,18 @@ c['schedulers'].append( SingleBranchScheduler(
 c['schedulers'].append( Nightly(
                             name="sched-dist",
                             branch=None,
-                            hour=3, minute=0,
+                            hour=2, minute=0,
+                            onlyIfChanged=True,
                             builderNames=["dist-win32-py27",
                                           "dist-osx-py27"]))
 
+c['schedulers'].append( Nightly(
+                            name="sched-docs",
+                            branch=None,
+                            hour=4, minute=0,
+                            onlyIfChanged=True,
+                            builderNames=["build-docs"]))
+
 ####### BUILDERS
 
 # The 'builders' list defines the Builders, which tell Buildbot how to perform a build:
@@ -101,11 +109,14 @@ def makeFactory(port, buildType='buildOnly'):
     factory.addStep(SVN(svnurl='http://svn.wxwidgets.org/svn/wx/wxPython/Phoenix/trunk',
                         workdir="Phoenix", mode='copy'))
 
-    cmd = 'python build.py dox touch etg --nodoc sip build'
-    if port == 'osx':
-        cmd += ' --mac_arch=i386,x86_64'
-    if buildType == 'dist':
-        cmd += ' bdist --upload_package'
+    if buildType == 'docs':
+        cmd = 'python build.py dox touch etg sphinx docs_bdist --upload_package'
+    else:
+        cmd = 'python build.py dox touch etg --nodoc sip build'
+        if port == 'osx':
+            cmd += ' --mac_arch=i386,x86_64'
+        if buildType == 'dist':
+            cmd += ' bdist --upload_package'
         
     factory.addStep(ShellCommand(command=cmd.split(), workdir="Phoenix"))
     return factory
@@ -113,26 +124,30 @@ def makeFactory(port, buildType='buildOnly'):
 
 
 c['builders'] = [
-                  BuilderConfig(name="build-osx-py27",
-                                slavenames=["osx_cocoa-py27"],
-                                factory=makeFactory('osx')),
+        BuilderConfig(name="build-osx-py27",
+                      slavenames=["osx_cocoa-py27"],
+                      factory=makeFactory('osx')),
 
-                  BuilderConfig(name="dist-osx-py27",
-                                slavenames=["osx_cocoa-py27"],
-                                factory=makeFactory('osx', 'dist')),
-                                
-                  BuilderConfig(name="build-win32-py27",
-                                slavenames=["win7-py27"],
-                                factory=makeFactory('win32')),
+        BuilderConfig(name="build-win32-py27",
+                      slavenames=["win7-py27"],
+                      factory=makeFactory('win32')),
 
-                  BuilderConfig(name="dist-win32-py27",
-                                slavenames=["win7-py27"],
-                                factory=makeFactory('win32', 'dist')),
-      
-                  BuilderConfig(name="build-gtk-py27",
-                                slavenames=["ubuntu-py27"],
-                                factory=makeFactory('gtk')),
-                  ]
+        BuilderConfig(name="build-gtk-py27",
+                      slavenames=["ubuntu-py27"],
+                      factory=makeFactory('gtk')),
+
+        BuilderConfig(name="dist-win32-py27",
+                      slavenames=["win7-py27"],
+                      factory=makeFactory('win32', 'dist')),
+
+        BuilderConfig(name="dist-osx-py27",
+                      slavenames=["osx_cocoa-py27"],
+                      factory=makeFactory('osx', 'dist')),
+                      
+        BuilderConfig(name="build-docs",
+                      slavenames=["ubuntu-py27"],
+                      factory=makeFactory('docs')),
+        ]