diff --git a/bootstrap b/bootstrap
index 872167c6..bde67cbd 100755
--- a/bootstrap
+++ b/bootstrap
@@ -1,3 +1,7 @@
 #!/bin/sh
 
+set -e
+
+cd "$(dirname "$0")"
+
 autoreconf -vif