diff --git a/ChangeLog b/ChangeLog
index 2097e00a3c..ebf223ea51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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.
+
 2005-10-07  Robert Love  <rml@novell.com>
 
 	* src/NetworkManagerWireless.c: remove stale, unused function, who goes
diff --git a/configure.in b/configure.in
index 86f7336d0d..cc9b5e1850 100644
--- a/configure.in
+++ b/configure.in
@@ -244,7 +244,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 	AC_MSG_RESULT(yes)
 	CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS"
 
-	for option in -Wno-unused -Wno-strict-aliasing -Wno-sign-compare -Wdeclaration-after-statement -Wno-pointer-sign ; do
+	for option in -Wno-unused -Wno-sign-compare -Wno-pointer-sign \
+		      -Wdeclaration-after-statement -Wstrict-prototypes \
+		      -Wmissing-prototypes -Wmissing-declarations; do
 		SAVE_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $option"
 		AC_MSG_CHECKING([whether gcc understands $option])