Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -1140,6 +1140,13 @@
                'category' : 'clang'
              },
              {
+               'name':"clang-tools-sphinx-docs",
+               'slavenames':["gribozavr4"],
+               'builddir':"clang-tools-sphinx-docs",
+               'factory': SphinxDocsBuilder.getSphinxDocsBuildFactory(clang_tools_html=True),
+               'category' : 'clang'
+             },
+             {
                'name':"lld-sphinx-docs",
                'slavenames':["gribozavr4"],
                'builddir':"lld-sphinx-docs",
Index: zorg/buildbot/builders/SphinxDocsBuilder.py
===================================================================
--- zorg/buildbot/builders/SphinxDocsBuilder.py
+++ zorg/buildbot/builders/SphinxDocsBuilder.py
@@ -6,11 +6,12 @@
 from zorg.buildbot.commands.NinjaCommand import NinjaCommand
 
 def getSphinxDocsBuildFactory(
-        llvm_html   = False, # Build LLVM HTML documentation
-        llvm_man    = False, # Build LLVM man pages
-        clang_html  = False, # Build Clang HTML documentation
-        lld_html    = False, # Build LLD HTML documentation
-        libcxx_html = False  # Build Libc++ HTML documentation
+        llvm_html         = False, # Build LLVM HTML documentation
+        llvm_man          = False, # Build LLVM man pages
+        clang_html        = False, # Build Clang HTML documentation
+        clang_tools_html  = False, # Build Clang Extra Tools HTML documentation
+        lld_html          = False, # Build LLD HTML documentation
+        libcxx_html       = False  # Build Libc++ HTML documentation
         ):
 
     f = buildbot.process.factory.BuildFactory()
@@ -37,6 +38,13 @@
                       defaultBranch='trunk',
                       workdir=clang_srcdir))
 
+    if clang_tools_html:
+        f.addStep(SVN(name='svn-clang',
+                      mode='update',
+                      baseURL='http://llvm.org/svn/llvm-project/clang-tools-extra/',
+                      defaultBranch='trunk',
+                      workdir=clang_srcdir))
+
     if lld_html:
         f.addStep(SVN(name='svn-lld',
                       mode='update',
@@ -99,6 +107,14 @@
                                targets=['docs-clang-html']
                               ))
 
+    if clang_tools_html:
+        f.addStep(NinjaCommand(name="docs-clang-tools-html",
+                               haltOnFailure=True,
+                               description=["Build Clang Extra Tools Sphinx HTML documentation"],
+                               workdir=llvm_objdir,
+                               targets=['docs-clang-tools-html']
+                              ))
+
     if lld_html:
         f.addStep(NinjaCommand(name="docs-lld-html",
                                haltOnFailure=True,