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
@@ -1997,6 +1997,24 @@
                     depends_on_projects=['llvm', 'libc'],
                     extra_args=['--debug'])},
 
+    {'name' : 'libc-riscv64-debian-dbg',
+    'tags'  : ["libc"],
+    'workernames' : ['libc-riscv64-debian'],
+    'builddir': 'libc-riscv64-debian-dbg',
+    'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
+                    script="libc-linux.py",
+                    depends_on_projects=['llvm', 'libc'],
+                    extra_args=['--debug'])},
+
+    {'name' : "libc-riscv64-debian-fullbuild-dbg",
+    'tags'  : ["libc"],
+    'workernames' : ["libc-riscv64-debian"],
+    'builddir': "libc-riscv64-debian-fullbuild-dbg",
+    'factory' : AnnotatedBuilder.getAnnotatedBuildFactory(
+                    script="libc-linux.py",
+                    depends_on_projects=['llvm', 'libc'],
+                    extra_args=['--debug'])},
+
 # Flang builders.
 
     {'name' : "flang-aarch64-dylib",
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
@@ -207,6 +207,8 @@
                     "libc-x86_64-debian-fullbuild-dbg",
                     "libc-x86_64-debian-gcc-fullbuild-dbg",
                     "libc-x86_64-debian-fullbuild-dbg-asan",
+                    "libc-riscv64-debian-dbg",
+                    "libc-riscv64-debian-fullbuild-dbg",
                     "libc-x86_64-debian-dbg-lint"]),
     reporters.MailNotifier(
         fromaddr = "llvm.buildmaster@lab.llvm.org",
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
@@ -190,6 +190,9 @@
         # Debian x86_64 Intel Cascade Lake 8 CPU, 32 GB RAM
         create_worker("libc-lint-worker", properties={'jobs': 16}, max_builds=2),
 
+        # Debian riscv64 4 CPU, 4 GB RAM
+        create_worker("libc-riscv64-debian", properties={'jobs': 4}, max_builds=1),
+
         # Windows Server on Xeon Gold 6130 (2x2.1GHz), 128Gb of RAM
         create_worker("as-builder-1", properties={
                         'remote_test_host': 'jetson6.lab.llvm.org',