diff --git a/ChangeLog b/ChangeLog
index 163cfacbe..fb7dc7725 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-10-31  Holger Vogt
+ * compile_min.sh: exit upon autogen or configure error
+ 
 2010-10-31  Dietmar Warning
  * src/spicelib/analysis/cktsetup.c, cktsopt.c: Allow maxord=1 w/o crash for 
    experimenting with backward Euler, works so far - but other timestep control
diff --git a/compile_min.sh b/compile_min.sh
index bf9cba4ab..8dcdbc4c3 100644
--- a/compile_min.sh
+++ b/compile_min.sh
@@ -18,6 +18,8 @@
 # --disable-debug will give O2 optimization (versus O0 for debug) and removes all debugging info.
 
 ./autogen.sh --adms
+if [ $? -ne 0 ]; then  echo "./autogen.sh failed"; exit 1 ; fi
+
 echo
 if test "$1" = "64"; then
 echo "configuring for 64 bit"
@@ -28,6 +30,7 @@ echo "configuring for 32 bit"
 echo
 ./configure --with-windows --enable-xspice --enable-cider --enable-openmp --enable-adms --disable-debug CFLAGS="-m32" LDFLAGS="-m32"
 fi
+if [ $? -ne 0 ]; then  echo "./configure failed"; exit 1 ; fi
 
 echo
 # make clean is required for properly making the code models