diff --git a/zorg/buildbot/builders/ClangBuilder.py b/zorg/buildbot/builders/ClangBuilder.py
--- a/zorg/buildbot/builders/ClangBuilder.py
+++ b/zorg/buildbot/builders/ClangBuilder.py
@@ -136,7 +136,7 @@
             checks=None,
             cmake='cmake',
             jobs=None,
-            timeout=None, # TODO: Implement support for timeout
+            timeout=1200,
 
             # VS tools environment variable if using MSVC. For example,
             # %VS120COMNTOOLS% selects the 2013 toolchain.
@@ -168,7 +168,8 @@
             checkout_flang=False,
             checkout_test_suite=False):
     return _getClangCMakeBuildFactory(
-               clean=clean, checks=checks, cmake=cmake, jobs=jobs, vs=vs,
+               clean=clean, checks=checks, cmake=cmake, jobs=jobs,
+               timeout=timeout,vs=vs,
                vs_target_arch=vs_target_arch, useTwoStage=useTwoStage,
                testStage1=testStage1, stage1_config=stage1_config,
                stage2_config=stage2_config, runTestSuite=runTestSuite,
@@ -187,6 +188,7 @@
             checks=None,
             cmake='cmake',
             jobs=None,
+            timeout=1200,
 
             # VS tools environment variable if using MSVC. For example,
             # %VS120COMNTOOLS% selects the 2013 toolchain.
@@ -345,6 +347,7 @@
 
     f.addStep(WarningCountingShellCommand(name='build stage 1',
                                           command=ninja_cmd,
+                                          timeout=timeout,
                                           haltOnFailure=True,
                                           description='ninja all',
                                           workdir=stage1_build,
@@ -354,6 +357,7 @@
         haltOnStage1Check = not useTwoStage and not runTestSuite
         f.addStep(LitTestCommand(name='ninja check 1',
                                  command=ninja_check_cmd,
+                                 timeout=timeout,
                                  haltOnFailure=haltOnStage1Check,
                                  description=["checking stage 1"],
                                  descriptionDone=["stage 1 checked"],
@@ -436,6 +440,7 @@
 
         f.addStep(WarningCountingShellCommand(name='build stage 2',
                                               command=ninja_cmd,
+                                              timeout=timeout,
                                               haltOnFailure=True,
                                               description='ninja all',
                                               workdir=stage2_build,
@@ -444,6 +449,7 @@
         if checks:
             f.addStep(LitTestCommand(name='ninja check 2',
                                      command=ninja_check_cmd,
+                                     timeout=timeout,
                                      haltOnFailure=not runTestSuite,
                                      description=["checking stage 2"],
                                      descriptionDone=["stage 2 checked"],
@@ -548,6 +554,7 @@
                                env=env))
         f.addStep(LitTestCommand(
                                name='test-suite',
+                               timeout=timeout,
                                command=test_suite_cmd,
                                haltOnFailure=True,
                                description=['running the test suite'],