diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config
index c637f4825..038072984 100644
--- a/sc2/build/unix/build.config
+++ b/sc2/build/unix/build.config
@@ -76,10 +76,13 @@ strictdebug_action() {
 			-Winline -Wuninitialized"
 #	CFLAGS="$CFLAGS "-Wpointer-arith"
 			# Some standard header won't even compile with this on
-	CFLAGS="$CFLAGS -Wshadow"
+#	CFLAGS="$CFLAGS -Wshadow"
 			# This gives absurd conflicts with standard files,
 			# like from 'y2'
-	CFLAGS="$CFLAGS -Werror"
+#	CFLAGS="$CFLAGS -Werror"
+			# We shouldn't do this until we actually nail them
+			# all in the original code.  Then we can enforce them
+			# on ourselves.
 #       CFLAGS="$CFLAGS -pedantic-errors -ansi -trigraphs"  # ANSI
 #	CFLAGS="$CFLAGS -Wnested-externs"
 			# We know they're in the code, and though we'd like to get