Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -479,6 +479,7 @@
                                                     package_cache="http://parkas1.inria.fr/packages",
                                                     submitURL=['http://gcc12.fsffrance.org:8808/submitRun','http://llvm.org/perf/submitRun'],
                                                     testerName='x86_64-penryn-O3')},
+
         {'name' : "clang-x86_64-linux-selfhost-modules",
          'slavenames' : ["modules-slave-1"],
          'builddir' : "clang-x86_64-linux-selfhost-modules",
@@ -494,6 +495,24 @@
                                                                              '-DLLVM_ENABLE_ASSERTIONS=ON'],
                                                        cmake='cmake')},
 
+        {'name' : "clang-x86_64-linux-werror",
+         'slavenames' : ["clang-werror-buildbot1"],
+         'builddir' : "clang-x86_64-linux-werror",
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                         triple='x86_64-pc-linux-gnu',
+                         useTwoStage=True,
+                         clean=False,
+                         stage1_config='Release',
+                         stage2_config='Release',
+                         runTestSuite=False,
+                         extra_configure_args=['-DCMAKE_C_COMPILER=clang',
+                                               '-DCMAKE_CXX_COMPILER=clang++',
+                                               '-DCMAKE_CXX_FLAGS=-stdlib=libc++',
+                                               '-DLLVM_ENABLE_LIBCXX=ON',
+                                               '-DLLVM_ENABLE_WERROR=ON',
+                                               '-DLLVM_ENABLE_ASSERTIONS=ON'],
+                         cmake='cmake')},
+
         {'name' : "clang-x64-ninja-win7",
          'slavenames' : ["windows7-buildbot"],
          'builddir' : "clang-x64-ninja-win7",
Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -147,6 +147,9 @@
         # Debian 7.7 x86_64 GCE instance
         create_slave("modules-slave-1", properties={'jobs': 16}, max_builds=1),
 
+        # Ubuntu 14.04 x86_64 16-core GCE instance
+        create_slave("clang-werror-buildbot1", properties={'jobs': 16}, max_builds=1),
+
         # zEnterprise 196 (s390x), SLES 12
         create_slave("systemz-1", properties={'jobs': 4}, max_builds=1),