diff --git a/lass/2configs/buildbot-standalone.nix b/lass/2configs/buildbot-standalone.nix
index 66e7e47b0..fefe01e0a 100644
--- a/lass/2configs/buildbot-standalone.nix
+++ b/lass/2configs/buildbot-standalone.nix
@@ -37,6 +37,14 @@ in {
                                     name="fast-all-branches",
                                     builderNames=["fast-tests"]))
       '';
+      build-makefu-scheduler = ''
+        # build makefu hosts
+        sched.append(schedulers.SingleBranchScheduler(
+                                    change_filter=util.ChangeFilter(branch_re="newest"),
+                                    treeStableTimer=10,
+                                    name="prism-newest",
+                                    builderNames=["build-makefu"]))
+      '';
       build-lass-scheduler = ''
         # build all lass hosts
         sched.append(schedulers.SingleBranchScheduler(
@@ -56,6 +64,11 @@ in {
         "NIX_REMOTE": "daemon",
         "dummy_secrets": "true",
       }
+      env_makefu = {
+        "LOGNAME": "makefu",
+        "NIX_REMOTE": "daemon",
+        "dummy_secrets": "true",
+      }
 
       # prepare nix-shell
       # the dependencies which are used by the test script
@@ -90,6 +103,25 @@ in {
               slavenames=slavenames,
               factory=f))
 
+            '';
+      build-makefu = ''
+        f = util.BuildFactory()
+        f.addStep(grab_repo)
+        #TODO: get hosts via krebs
+        for i in [ "pornocauster", "wry" ]:
+          addShell(f,name="build-{}".format(i),env=env_makefu,
+                  command=nixshell + \
+                      ["make \
+                            test \
+                            ssh=${sshWrapper} \
+                            target=build@localhost:${config.users.users.build.home}/testbuild \
+                            method=build \
+                            system={}".format(i)])
+
+        bu.append(util.BuilderConfig(name="build-makefu",
+              slavenames=slavenames,
+              factory=f))
+
             '';
       fast-tests = ''
         f = util.BuildFactory()