diff --git a/builders.py b/builders.py
index 85313e2..294200f 100644
--- a/builders.py
+++ b/builders.py
@@ -410,9 +410,18 @@ def create_doc_builder_factory():
         mode='incremental',
         haltOnFailure=True,
         name='Fetch yocto-docs'))
+    f.addStep(steps.Git(
+        repourl=config.repos["bitbake"][0],
+        branch=config.repos["bitbake"][1],
+        workdir=util.Interpolate("%(prop:builddir)s/bitbake"),
+        mode='incremental',
+        haltOnFailure=True,
+        name='Fetch bitbake'))
     f.addStep(steps.ShellCommand(
         command=[util.Interpolate("%(prop:builddir)s/yocto-autobuilder-helper/scripts/run-docs-build"),
-                 util.Interpolate("%(prop:builddir)s/yocto-docs")],
+                 util.Interpolate("%(prop:builddir)s"),
+                 util.Interpolate("%(prop:builddir)s/yocto-docs"),
+                 util.Interpolate("%(prop:builddir)s/bitbake")],
         haltOnFailure=True,
         name="Run documentation Build"))
     return f
diff --git a/config.py b/config.py
index a986251..81d8dea 100644
--- a/config.py
+++ b/config.py
@@ -17,7 +17,7 @@ buildertorepos = {
     "qemuarm-oecore": ["oecore", "bitbake"],
     "checkuri": ["poky"],
     "check-layer": ["poky", "meta-mingw", "meta-gplv2"],
-    "docs": ["yocto-docs"],
+    "docs": ["yocto-docs", "bitbake"],
     "default": ["poky"]
 }