diff --git a/README.md b/README.md
index f5365a48..edd05107 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 To start hacking on Hydra, run:
 
+    $ bootstrap
     $ nix-shell
     $ ./configure $configureFlags --prefix=/opt/hydra
     $ make
diff --git a/hydra-module.nix b/hydra-module.nix
index eeaf62be..32bb2f75 100644
--- a/hydra-module.nix
+++ b/hydra-module.nix
@@ -164,7 +164,7 @@ in
       };
 
       buildMachinesFiles = mkOption {
-        type = types.list types.path;
+        type = types.listOf types.path;
         default = [];
         example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ];
         description = "List of files containing build machines.";
diff --git a/release.nix b/release.nix
index 85bfaa70..d6e6ae5c 100644
--- a/release.nix
+++ b/release.nix
@@ -118,7 +118,7 @@ rec {
         [ makeWrapper autoconf automake libtool unzip nukeReferences pkgconfig sqlite libpqxx
           gitAndTools.topGit mercurial darcs subversion bazaar openssl bzip2 libxslt
           guile # optional, for Guile + Guix support
-          perlDeps perl
+          perlDeps perl nix
           postgresql92 # for running the tests
           (lib.overrideDerivation (aws-sdk-cpp.override {
             apis = ["s3"];