diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -2206,7 +2206,7 @@
     'tags'  : ["clang", "doc"],
     'workernames' : ["gribozavr3"],
     'builddir': "clang-sphinx-docs",
-    'factory' : SphinxDocsBuilder.getSphinxDocsBuildFactory(clang_html=True)},
+    'factory' : SphinxDocsBuilder.getSphinxDocsBuildFactory(clang_html=True, clang_man=True)},
 
     {'name' : "clang-tools-sphinx-docs",
     'tags'  : ["clang-tools", "doc"],
diff --git a/zorg/buildbot/builders/SphinxDocsBuilder.py b/zorg/buildbot/builders/SphinxDocsBuilder.py
--- a/zorg/buildbot/builders/SphinxDocsBuilder.py
+++ b/zorg/buildbot/builders/SphinxDocsBuilder.py
@@ -26,6 +26,7 @@
         llvm_html         = False, # Build LLVM HTML documentation
         llvm_man          = False, # Build LLVM man pages
         clang_html        = False, # Build Clang HTML documentation
+        clang_man         = False, # Build Clang man pages
         clang_tools_html  = False, # Build Clang Extra Tools HTML documentation
         lld_html          = False, # Build LLD HTML documentation
         lldb_html         = False, # Build LLDB HTML documentation
@@ -95,6 +96,14 @@
                                targets=['docs-clang-html']
                               ))
 
+    if clang_man:
+        f.addStep(NinjaCommand(name="docs-clang-man",
+                               haltOnFailure=True,
+                               description=["Build Clang Sphinx man pages"],
+                               workdir=llvm_objdir,
+                               targets=['docs-clang-man']
+                              ))
+
     if clang_tools_html:
         f.addStep(NinjaCommand(name="docs-clang-tools-html",
                                haltOnFailure=True,