diff --git a/.gitignore b/.gitignore
index bbbf928..e84719b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 build/
+builddir/
 *.swp
diff --git a/.travis.yml b/.travis.yml
index d2c6e2b..642ef33 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,6 @@ addons:
 script:
   - ./scripts/format-check.sh
   - ./bootstrap.sh -Dwith-examples=true
-  - meson test -C build
+  - meson test -C builddir
   - dbus-run-session -- gamemode-simulate-game
   - ./scripts/static-analyser-check.sh 
diff --git a/README.md b/README.md
index 1ee258c..752cfbb 100644
--- a/README.md
+++ b/README.md
@@ -119,8 +119,7 @@ git checkout 1.5.1 # omit to build the master branch
 To uninstall:
 ```bash
 systemctl --user stop gamemoded.service
-cd build/
-ninja uninstall
+ninja uninstall -C builddir
 ```
 
 ### Pull Requests
diff --git a/bootstrap.sh b/bootstrap.sh
index de5a4b0..22ac240 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -26,9 +26,8 @@ fi
 
 # Echo the rest so it's obvious
 set -x
-meson --prefix=$prefix build --buildtype debugoptimized -Dwith-systemd-user-unit-dir=/etc/systemd/user "$@"
-cd build
-ninja
+meson builddir --prefix=$prefix --buildtype debugoptimized -Dwith-systemd-user-unit-dir=/etc/systemd/user "$@"
+ninja -C builddir
 
 # Verify user wants to install
 set +x
@@ -38,7 +37,7 @@ if [ "$TRAVIS" != "true" ]; then
 fi
 set -x
 
-sudo ninja install
+sudo ninja install -C builddir
 
 # Restart polkit so we don't get pop-ups whenever we pkexec
 if systemctl list-unit-files |grep -q polkit.service; then
diff --git a/scripts/static-analyser-check.sh b/scripts/static-analyser-check.sh
index bee49a6..50c3510 100755
--- a/scripts/static-analyser-check.sh
+++ b/scripts/static-analyser-check.sh
@@ -3,11 +3,8 @@
 # Exit on failure
 set -e
 
-# Build directly
-cd build/
-
 # Collect scan-build output
-ninja scan-build | tee /tmp/scan-build-results.txt
+ninja scan-build -C builddir | tee /tmp/scan-build-results.txt
 
 # Invert the output - if this string exists it's a fail
 ! grep -E '[0-9]+ bugs? found.' /tmp/scan-build-results.txt