diff --git a/bootstrap b/bootstrap
index c06dc86d06..b0af7ca9ec 100755
--- a/bootstrap
+++ b/bootstrap
@@ -76,8 +76,8 @@ generate)
     cd $dir;
     aclocal -I $aclocal_dir;
     autoconf;
-    test -f Makefile.am && automake $verbose ;
     test -n "`grep CONFIG_HEADER configure.in`" && autoheader ;
+    test -f Makefile.am && automake $verbose ;
     test -f Makefile.am && test -n "`grep 'stamp-h\.in' Makefile.in`" \
       && echo timestamp > stamp-h.in
   )
diff --git a/make/host.cfg.in b/make/host.cfg.in
index 15f5a11256..aa215b8eae 100644
--- a/make/host.cfg.in
+++ b/make/host.cfg.in
@@ -19,7 +19,7 @@ SHELL=@SHELL@
 ECHO=echo
 
 CAT=cat
-RM=@RM@ -f
+## RM=@RM@ -f
 CP=@CP@
 MV=@MV@
 LN=@LN@