diff --git a/.buildkite/linux/entrypoint b/.buildkite/linux/entrypoint
index 5686997b2..0c79088f3 100755
--- a/.buildkite/linux/entrypoint
+++ b/.buildkite/linux/entrypoint
@@ -2,13 +2,16 @@
 
 set -e
 
-echo "+++ Building and testing"
-ln -sf out/node_modules .
-
 export PATH="$PATH:/state/rust/cargo/bin"
 export BUILD_ROOT=/state/build
 export ONLINE_TESTS=1
 
+echo "--- Install n2"
+./tools/install-n2
+
+echo "+++ Building and testing"
+ln -sf out/node_modules .
+
 if [ "$CLEAR_RUST" = "1" ]; then
     rm -rf $BUILD_ROOT/rust
 fi
diff --git a/docs/development.md b/docs/development.md
index 0084e0cc0..1d1ead6b6 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -35,8 +35,9 @@ On all platforms, you will need to install:
   will be automatically downloaded if not yet installed. If removing that file
   to use a distro-provided Rust, newer Rust versions will typically work for
   building but may fail tests; older Rust versions may not work at all.
-- N2 or Ninja. On Linux/Mac, N2 gives better status output (run tools/install-n2). Ninja
-  can be downloaded from https://github.com/ninja-build/ninja/releases/tag/v1.11.1 and
+- N2 or Ninja. N2 gives better status output. You can install it with `tools/install-n2`,
+  or `bash tools\install-n2` on Windows. If you want to use Ninja, it can be downloaded
+  from https://github.com/ninja-build/ninja/releases/tag/v1.11.1 and
   placed on your path, or from your distro/homebrew if it's 1.10+.
 
 Platform-specific requirements:
diff --git a/tools/install-n2 b/tools/install-n2
index edfb8b6b8..cabc23115 100755
--- a/tools/install-n2
+++ b/tools/install-n2
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cargo install --git https://github.com/evmar/n2.git --rev 603e5fd7e7e878fcb87fd67f0bd23e715c840bf5
+cargo install --git https://github.com/ankitects/n2.git --rev 89ca7dd54f6306f25eb0bfd14c7a458dd4befb7e