diff --git a/buildbot/osuosl/master/config/builders.py b/buildbot/osuosl/master/config/builders.py
index d1b0b39..f4b38b0 100644
--- a/buildbot/osuosl/master/config/builders.py
+++ b/buildbot/osuosl/master/config/builders.py
@@ -446,13 +446,14 @@
                ),
          'category'   : 'lld'},
 
-        # AArch64 Clang+LLVM+RT check-all + test-suite + self-hosting
+        # AArch64 Clang+LLVM+RT check-all + flang + test-suite + self-hosting
         {'name': "clang-cmake-aarch64-full",
          'slavenames':["linaro-aarch64-full"],
          'builddir':"clang-cmake-aarch64-full",
          'factory' : ClangBuilder.getClangCMakeBuildFactory(
                       clean=False,
                       checkout_compiler_rt=True,
+                      checkout_flang=True,
                       checkout_lld=False,
                       test=True,
                       useTwoStage=True,
diff --git a/zorg/buildbot/builders/ClangBuilder.py b/zorg/buildbot/builders/ClangBuilder.py
index b6ea5bc..e75ee06 100644
--- a/zorg/buildbot/builders/ClangBuilder.py
+++ b/zorg/buildbot/builders/ClangBuilder.py
@@ -162,6 +162,7 @@
             checkout_compiler_rt=True,
             checkout_lld=True,
             checkout_libcxx=False,
+            checkout_flang=False,
             checkout_test_suite=False):
     return _getClangCMakeBuildFactory(
                clean=clean, test=test, cmake=cmake, jobs=jobs, vs=vs,
@@ -175,6 +176,7 @@
                checkout_lld=checkout_lld,
                checkout_compiler_rt=checkout_compiler_rt,
                checkout_libcxx=checkout_libcxx,
+               checkout_flang=checkout_flang,
                checkout_test_suite=checkout_test_suite)
 
 def _getClangCMakeBuildFactory(
@@ -211,6 +213,7 @@
             checkout_lld=True,
             checkout_libcxx=False,
             checkout_test_suite=False,
+            checkout_flang=False,
 
             # Upload artifacts to Google Cloud Storage (for the llvmbisect tool)
             stage1_upload_directory=None,
@@ -253,6 +256,9 @@
         depends_on_projects.append('libcxx')
         depends_on_projects.append('libcxxabi')
         depends_on_projects.append('libunwind')
+    if checkout_flang:
+        depends_on_projects.append('flang')
+        depends_on_projects.append('mlir')
 
     f = LLVMBuildFactory(
             depends_on_projects=depends_on_projects,