diff --git a/ChangeLog b/ChangeLog
index ebf223ea5..d4667c08a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,11 @@
 2005-10-07  Robert Love  <rml@novell.com>
 
 	* configure.in: Change our compile flags for the betterment of mankind.
-	  Remove "-Wno-strict-aliasing" because we should not be doing bad
-	  aliasing or type punning that throws off optimizations (this is esp.
-	  important in gcc 4.1).  Add "-Wstrict-prototypes" because we comply
-	  anyhow and missing a prototype is very bad on 64-bit platforms as
-	  types default to int but sizeof(int) != sizeof(long), add
-	  "-Wmissing-prototypes" and "-Wmissing-declarations" to warn if we
-	  define an exported function but fail to put it in a header.
+	  Add "-Wstrict-prototypes" because we comply anyhow and missing a
+	  prototype is very bad on 64-bit platforms as types default to int but
+	  sizeof(int) != sizeof(long), add "-Wmissing-prototypes" and
+	  "-Wmissing-declarations" to warn if we define an exported function
+	  but fail to put it in a header.
 
 2005-10-07  Robert Love  <rml@novell.com>
 
diff --git a/configure.in b/configure.in
index cc9b5e185..1bc4a416b 100644
--- a/configure.in
+++ b/configure.in
@@ -246,7 +246,8 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 
 	for option in -Wno-unused -Wno-sign-compare -Wno-pointer-sign \
 		      -Wdeclaration-after-statement -Wstrict-prototypes \
-		      -Wmissing-prototypes -Wmissing-declarations; do
+		      -Wmissing-prototypes -Wmissing-declarations \
+		      -Wno-strict-aliasing; do
 		SAVE_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $option"
 		AC_MSG_CHECKING([whether gcc understands $option])