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
@@ -2357,6 +2357,28 @@
              'CC': 'clang',
              'CXX': 'clang++',
              'LD': 'lld',
-         })}
+         })},
+
+    # Standalone builder
+    {'name' : "standalone-build-x86_64",
+    'tags'  : ["clang"],
+    'collapseRequests': False,
+    'workernames':["standalone-build-x86_64"],
+    'builddir':"standalone-build-x86_64",
+    'factory' : UnifiedTreeBuilder.getCmakeWithNinjaBuildFactory(
+                    llvm_srcdir="llvm.src",
+                    obj_dir="llvm.obj",
+                    clean=True,
+                    depends_on_projects=['llvm','clang'],
+                    extra_configure_args=[
+                        "-DCOMPILER_RT_BUILD_BUILTINS:BOOL=OFF",
+                        "-DCOMPILER_RT_BUILD_ORC:BOOL=OFF",
+                        "-DCOMPILER_RT_BUILD_SANITIZERS:BOOL=OFF",
+                        "-DCOMPILER_RT_BUILD_XRAY:BOOL=OFF",
+                        "-DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF",
+                        "-DCMAKE_C_FLAGS=-Wdocumentation -Wno-documentation-deprecated-sync",
+                        "-DCMAKE_CXX_FLAGS=-std=c++11 -Wdocumentation -Wno-documentation-deprecated-sync",
+                    ],
+                    )},
 
 ]
diff --git a/buildbot/osuosl/master/config/status.py b/buildbot/osuosl/master/config/status.py
--- a/buildbot/osuosl/master/config/status.py
+++ b/buildbot/osuosl/master/config/status.py
@@ -317,6 +317,14 @@
         mode = "failing",
         builders = ["cross-project-tests-sie-ubuntu",
                     "llvm-clang-x86_64-sie-win"]),
+    reporters.MailNotifier(
+        fromaddr = "llvm.buildmaster@lab.llvm.org",
+        sendToInterestedUsers = False,
+        extraRecipients = ["kkleine@redhat.com"],
+        subject = "Build %(builder)s Failure",
+        mode = "failing",
+        builders = ["standalone-build-x86_64"]),
+
 ]
 
 
diff --git a/buildbot/osuosl/master/config/workers.py b/buildbot/osuosl/master/config/workers.py
--- a/buildbot/osuosl/master/config/workers.py
+++ b/buildbot/osuosl/master/config/workers.py
@@ -291,4 +291,7 @@
 
         # BOLT worker
         create_worker("bolt-worker", properties={'jobs' : 16}, max_builds=1),
+
+        # Fedora worker
+        create_worker("standalone-build-x86_64", properties={'jobs': 32}, max_builds=1),
         ]