diff --git a/sc2/build/unix/build.config b/sc2/build/unix/build.config
index 02013caf7..3b087761c 100644
--- a/sc2/build/unix/build.config
+++ b/sc2/build/unix/build.config
@@ -150,14 +150,17 @@ uqm_prepare_config()
 				CFLAGS="$CFLAGS -g -O0 -DDEBUG -D_DEBUG"
 				;;
 			*)
-				CFLAGS="$CFLAGS -O1"  # This is needed for -Wunitialized
-				CFLAGS="$CFLAGS -g -DDEBUG -W -Wall \
-						-Wbad-function-cast -Wcast-qual -Wmissing-prototypes \
+				CFLAGS="$CFLAGS -g -DDEBUG -W -Wall"
+#				CFLAGS="$CFLAGS -O1"
+						# This is needed for -Wunitialized with gcc 3.4
+				CFLAGS="$CFLAGS -Wbad-function-cast -Wcast-qual -Wmissing-prototypes \
 						-Wstrict-prototypes -Wmissing-declarations \
 						-Wwrite-strings -Wimplicit -Wreturn-type -Wformat \
 						-Wswitch -Wcomment -Wchar-subscripts \
 						-Wparentheses -Wcast-align \
 						-Wuninitialized"
+				CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+						# Until we abandon MSVC 6
 #				CFLAGS="$CFLAGS -Waggregate-return"
 						# It's not unreasonable to return structs at times.
 #				CFLAGS="$CFLAGS "-Wpointer-arith"