Index: buildbot/osuosl/master/master.cfg
===================================================================
--- buildbot/osuosl/master/master.cfg
+++ buildbot/osuosl/master/master.cfg
@@ -188,9 +188,31 @@
                                   name="lldb_android_scheduler",
                                   builderNames=lldb_android_builders)))
 
+# netbsd uses a single bot for multiple projects even though it is named
+# lldb for historical reasons
+netbsd_builders=["lldb-amd64-ninja-netbsd8"]
+c['schedulers'].append(SingleBranchScheduler(name="netbsd_scheduler",
+                            treeStableTimer=2*60,
+                            builderNames=netbsd_builders,
+                            change_filter=depends_on([
+                                "cfe",
+                                "clang-tools-extra",
+                                "compiler-rt",
+                                "libcxx",
+                                "libcxxabi",
+                                "libunwind",
+                                "lld",
+                                "lldb",
+                                "llvm",
+                                "openmp"
+                                "polly",
+                            ])))
+
 c['schedulers'].append(SingleBranchScheduler(name="lldb_scheduler",
                             treeStableTimer=2*60,
-                            builderNames=list(set(get_all_for("lldb"))-set(lldb_android_builders)),
+                            builderNames=list(set(get_all_for("lldb"))
+                                             -set(lldb_android_builders)
+                                             -set(netbsd_builders)),
                             change_filter=depends_on([
                                 "llvm",
                                 "cfe",