diff --git a/sim/ChangeLog b/sim/ChangeLog
index 72824aa056..caefc89c90 100644
--- a/sim/ChangeLog
+++ b/sim/ChangeLog
@@ -1,5 +1,8 @@
 2006-12-20  Hans-Peter Nilsson  <hp@axis.com>
 
+	* Makefile.in (autoconf-common autoheader-common): Only run
+	autoheader on subdirs with a file config.in.
+
 	* configure.ac (common): Make the default "yes" for all targets
 	with sim subdirs.
 	* configure: Regenerate.
diff --git a/sim/Makefile.in b/sim/Makefile.in
index 6497f5d9cc..7551f95c7c 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -216,7 +216,7 @@ autoconf-common autoheader-common:
 	    then \
 		 echo "Running autoconf in $$d ..." ; \
 		 (cd $$d && autoconf --force) ; \
-		 if [ $@ = autoheader-common ] ; \
+		 if [ $@ = autoheader-common ] && [ -f $$d/config.in ] ; \
 		 then \
 		   echo "Running autoheader in $$d ..." ; \
 		   (cd $$d && autoheader --force) ; \