diff --git a/.gitignore b/.gitignore
index 9ea7abe9..ae864b36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,7 +62,7 @@ packages/*
 
 # FAKE & Paket
 packages/FAKE
-tools/paket/paket.exe
+.paket/paket.exe
 
 # Generated Doc Files
 docs/content/License.md
diff --git a/.paket/paket.bootstrapper.exe b/.paket/paket.bootstrapper.exe
new file mode 100644
index 00000000..9e65e6b5
Binary files /dev/null and b/.paket/paket.bootstrapper.exe differ
diff --git a/build.cmd b/build.cmd
index 3a5ccf9b..40aff456 100644
--- a/build.cmd
+++ b/build.cmd
@@ -1,7 +1,14 @@
 @echo off
 cls
-if not exist tools\paket\paket.exe (
-  tools\paket\paket.bootstrapper.exe
+
+.paket\paket.bootstrapper.exe
+if errorlevel 1 (
+  exit /b %errorlevel%
 )
-tools\paket\paket.exe restore
+
+.paket\paket.exe restore
+if errorlevel 1 (
+  exit /b %errorlevel%
+)
+
 packages\FAKE\tools\FAKE.exe build.fsx %*
diff --git a/build.sh b/build.sh
index 8940e259..7ff6647e 100755
--- a/build.sh
+++ b/build.sh
@@ -1,13 +1,32 @@
-#!/bin/bash
-if test "$OS" = "Windows_NT"
+#!/usr/bin/env bash
+
+set -eu
+set -o pipefail
+
+cd `dirname $0`
+
+FSIARGS=""
+OS=${OS:-"unknown"}
+if [[ "$OS" != "Windows_NT" ]]
 then
-  # use .Net
-  [ ! -f tools/paket/paket.exe ] && tools/paket/paket.bootstrapper.exe
-  tools/paket/paket.exe restore
-  packages/FAKE/tools/FAKE.exe build.fsx $@
-else
-  # use mono
-  [ ! -f tools/paket/paket.exe ] && mono --runtime=v4.0 tools/paket/paket.bootstrapper.exe
-  mono --runtime=v4.0 tools/paket/paket.exe restore
-  mono --runtime=v4.0 packages/FAKE/tools/FAKE.exe $@ --fsiargs -d:MONO build.fsx
+  FSIARGS="--fsiargs -d:MONO"
 fi
+
+function run() {
+  if [[ "$OS" != "Windows_NT" ]]
+  then
+    mono "$@"
+  else
+    "$@"
+  fi
+}
+
+run .paket/paket.bootstrapper.exe
+
+if [[ "$OS" != "Windows_NT" ]] && [ ! -e ~/.config/.mono/certs ]
+then
+  mozroots --import --sync --quiet
+fi
+
+run .paket/paket.exe restore
+run packages/FAKE/tools/FAKE.exe "$@" $FSIARGS build.fsx
diff --git a/tools/paket/paket.bootstrapper.exe b/tools/paket/paket.bootstrapper.exe
deleted file mode 100644
index fe6adc07..00000000
Binary files a/tools/paket/paket.bootstrapper.exe and /dev/null differ