diff --git a/hydra-module.nix b/hydra-module.nix
index 3ab63fcd..a7cc9ce0 100644
--- a/hydra-module.nix
+++ b/hydra-module.nix
@@ -20,6 +20,7 @@ let
     { NIX_REMOTE = "daemon";
       SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt"; # Remove in 16.03
       PGPASSFILE = "${baseDir}/pgpass";
+      NIX_REMOTE_SYSTEMS = concatStringsSep ":" cfg.buildMachinesFiles;
     } // hydraEnv // cfg.extraEnv;
 
   serverEnv = env //
@@ -149,6 +150,13 @@ in
         default = "/nix/var/nix/gcroots/hydra";
         description = "Directory that holds Hydra garbage collector roots.";
       };
+
+      buildMachinesFiles = mkOption {
+        type = types.list types.path;
+        default = [];
+        example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ];
+        description = "List of files containing build machines.";
+      };
     };
 
   };
@@ -311,6 +319,7 @@ in
           { ExecStart = "@${cfg.package}/bin/hydra-evaluator hydra-evaluator";
             User = "hydra";
             Restart = "always";
+            WorkingDirectory = baseDir;
           };
       };