diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 1a9c156..5e8b3ca 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -358,12 +358,12 @@ for plat in build_platforms:
         c['builders'] += [
             BuilderConfig(
                 name="portwatcher-" + plat,
-                slavenames=[plat],
+                slavenames=["ports-" + plat],
                 factory=make_portwatcher_factory("triggerable-portbuilder-" + plat),
                 env={"PATH": "/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"}),
             BuilderConfig(
                 name="portbuilder-" + plat,
-                slavenames=[plat],
+                slavenames=["ports-" + plat],
                 factory=portbuilder_factory,
                 env={"PATH": tools_prefix + "/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin"})]
 
diff --git a/buildbot/slaves.json.sample b/buildbot/slaves.json.sample
index eaa18fb..a94dc36 100644
--- a/buildbot/slaves.json.sample
+++ b/buildbot/slaves.json.sample
@@ -1,4 +1,4 @@
 {
-	"base-10.6-x86_64": "***",
-	"10.6-x86_64": 	    "***"
+	"base-10.6-x86_64":  "***",
+	"ports-10.6-x86_64": "***"
 }