Index: buildbot/osuosl/master/config/builders.py
===================================================================
--- buildbot/osuosl/master/config/builders.py
+++ buildbot/osuosl/master/config/builders.py
@@ -318,6 +318,18 @@
                                                        stage1_config='Release+Asserts',
                                                        stage2_config='Release+Asserts')},
 
+        {'name': 'clang-x86-win2008-selfhost',
+         'slavenames': ['windows-gcebot1'],
+         'builddir': 'clang-x86-win2008-selfhost',
+         'factory' : ClangBuilder.getClangCMakeBuildFactory(
+                        triple='i686-pc-windows-msvc',
+                        clean=False,
+                        checkout_compiler_rt=False,
+                        testStage1=True,
+                        stage1_config='Release',
+                        stage2_config='Release',
+                        extra_cmake_args=["-DLLVM_ENABLE_ASSERTIONS=ON"])},
+
         {'name' : "clang-ppc64-elf-linux",
          'slavenames' :["chinook-clangslave1"],
          'builddir' :"clang-ppc64-1",
Index: buildbot/osuosl/master/config/slaves.py
===================================================================
--- buildbot/osuosl/master/config/slaves.py
+++ buildbot/osuosl/master/config/slaves.py
@@ -168,6 +168,8 @@
         create_slave("zturner-win2008", properties={'jobs': 4}, max_builds=1),
         # Windows Server 2008 R2, Quad 2.6GHz Intel Xeon(R) 8GB RAM
         create_slave("sanitizer-windows", properties={'jobs': 4}, max_builds=1),
+        # Windows Server 2008 R2, Quad 2.6GHz Intel Xeon(R) 8GB RAM
+        create_slave("windows-gcebot1", properties={'jobs': 8}, max_builds=1),
 
         # Ubuntu x86-64, 51GiB System memory Intel(R) Xeon(R) CPU @ 2.60GHz
         create_slave("lldb-build1-ubuntu-1404", properties={'jobs': 16, 'loadaverage':