diff --git a/ChangeLog b/ChangeLog
index 5fc3511231e36404166ee01494cdfe9a4bbc050b..e15da30c639832c159fa883c59b6528de2df63b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-18  Mike Stump  <mrs@apple.com>
+
+	* configure.in: Re-enable -Werror for gcc builds.
+
 2007-01-11 Harsha Jagasia <harsha.jagasia@amd.com>
 
         * MAINTAINERS (Write After Approval): Add myself.
diff --git a/configure b/configure
index 7a56401d7f2ee082b55866229a1b034cfbd70224..bf1883e69217c70ff31f164a05864287d5e8c4c3 100755
--- a/configure
+++ b/configure
@@ -7482,7 +7482,7 @@ if test "${enable_werror+set}" = set; then
   enableval="$enable_werror"
   :
 else
-  if test -d gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then
+  if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then
   enable_werror=yes
 else
   enable_werror=no
diff --git a/configure.in b/configure.in
index 8b2071a921760301353ab5a70c23824cb9a57932..98c024695b17db0f97885b7d42d1b496d6b2a7f5 100644
--- a/configure.in
+++ b/configure.in
@@ -2528,7 +2528,7 @@ AC_SUBST(stage1_checking)
 # Enable -Werror in bootstrap stage2 and later.
 AC_ARG_ENABLE(werror,
 [  --enable-werror         enable -Werror in bootstrap stage2 and later], [],
-[if test -d gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then
+[if test -d ${srcdir}/gcc && test x"`cat $srcdir/gcc/DEV-PHASE`" = xexperimental; then
   enable_werror=yes
 else
   enable_werror=no