diff --git a/ChangeLog b/ChangeLog
index 234f2921cd6..d4e4ef34312 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-09-05  Richard Guenther  <rguenther@suse.de>
+
+	* configure.ac (--enable-stage1-checking): If neither --enable-checking
+	nor --disable-checking is provided also turn on yes and types
+	checking for stage1.
+	* configure: Re-generate.
+
 2007-08-30  Krister Walfridsson  <cato@df.lth.se>
 
 	* MAINTAINERS (OS Port Maintainers): Add myself as NetBSD maintainer.
diff --git a/configure b/configure
index 1a37bfd6b33..dd12627fcd4 100755
--- a/configure
+++ b/configure
@@ -11992,10 +11992,10 @@ if test "${enable_stage1_checking+set}" = set; then
   enableval="$enable_stage1_checking"
   stage1_checking=--enable-checking=${enable_stage1_checking}
 else
-  if test "x$enable_checking" = xno; then
+  if test "x$enable_checking" = xno || test "x$enable_checking" = x; then
   stage1_checking=--enable-checking=yes,types
 else
-  stage1_checking=--enable-checking=types${enable_checking+,}$enable_checking
+  stage1_checking=--enable-checking=$enable_checking,types
 fi
 fi;
 
diff --git a/configure.ac b/configure.ac
index 2486049cf18..57de10003ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2613,10 +2613,10 @@ AC_ARG_ENABLE(stage1-checking,
 [  --enable-stage1-checking@<:@=all@:>@   choose additional checking for stage1
                           of the compiler],
 [stage1_checking=--enable-checking=${enable_stage1_checking}],
-[if test "x$enable_checking" = xno; then
+[if test "x$enable_checking" = xno || test "x$enable_checking" = x; then
   stage1_checking=--enable-checking=yes,types
 else
-  stage1_checking=--enable-checking=types${enable_checking+,}$enable_checking
+  stage1_checking=--enable-checking=$enable_checking,types
 fi])
 AC_SUBST(stage1_checking)