diff --git a/MANIFEST.in b/MANIFEST.in
index 41c49fb8..0f8652cb 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -3,10 +3,14 @@
 # still an easy way to specify what data files (non *.py files) should be 
 # included in the package dirs.
 #
+# See cmd_sdist() in build.py for the actual building of the source dist.
+#
 
 recursive-include   wx  **
 recursive-include   license  *.txt
 include             LICENSE.txt
+graft               docs
+prune               docs/sphinx/build
 
 recursive-exclude   wx  .git
 recursive-exclude   wx  *.pyc
diff --git a/build.py b/build.py
index eab9baac..c0aaaf62 100755
--- a/build.py
+++ b/build.py
@@ -1766,10 +1766,16 @@ def cmd_sdist(options, args):
     getWafCmd()
     copyFile('bin/waf-%s' % wafCurrentVersion, os.path.join(PDEST, 'bin'))
 
-    # and the REV.txt if there is one
+    # And the REV.txt if there is one
     if os.path.exists('REV.txt'):
         copyFile('REV.txt', PDEST)
 
+    # Copy the Sphinx source files in the docs tree, excluding the html and
+    # sphinx/build folders, if present.
+    shutil.rmtree(opj(PDEST, 'docs'), ignore_errors=True)
+    shutil.copytree('docs', opj(PDEST, 'docs'),
+                    ignore=shutil.ignore_patterns('html', 'build', '__pycache__', 'cpp'))
+
     # Add some extra stuff to the root folder
     cmd_egg_info(options, args, egg_base=PDEST)
     copyFile(opj(PDEST, '{}.egg-info/PKG-INFO'.format(baseName)),
diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index a4f09185..53b1943e 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -213,7 +213,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
     factory = BuildFactory()
 
     # Was the build started from the force build form with a "fullclean"
-    # property set? If so, clobber the git workspace and start fresh.
+    # property set? If so, fully clobber the git workspace and start fresh.
     cmd = ['bash', '-c',
            WithProperties('if [ %(fullclean:-no)s == yes ]; then rm -rf ../Phoenix; echo fully cleaned; fi'),
            ]
@@ -226,7 +226,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', 'vagrant']:
+    if buildType in ['dist', 'sdist', 'docs', 'vagrant']:
         mode = 'full'
         method = 'clobber'
 
@@ -246,7 +246,7 @@ def makeFactory(port, buildType='buildOnly', pyVer='2.7'):
 
     if buildType == 'sdist':
         cmd = 'python -u build.py %s setrev dox touch etg sip build '\
-              'sdist sdist_demo --upload' % pyVer
+              'wxlib sdist sdist_demo --upload' % pyVer
 
     elif buildType == 'docs':
         cmd = 'python -u build.py %s setrev dox touch etg sip build wxlib ' \