diff --git a/bootstrap b/bootstrap
index d18442e1..b00be326 100755
--- a/bootstrap
+++ b/bootstrap
@@ -28,8 +28,12 @@
 #
 #----------------------------------------------------------------------------
 
+set -e
 set -x
+
 touch ChangeLog
+mkdir -p m4
+
 autoreconf -i
 
 #----------------------------------------------------------------------------