diff --git a/CHANGES b/CHANGES
index 95654f20c5ff1b86c434541678263520b815517f..6c33e39dc7739160499295e8cb65de1d58d54942 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@
 
                                   Changelog
 
+Daniel Fandrich (16 June 2009)
+- Added a few more compiler warning options for gcc.
+
 Daniel Stenberg (16 Jun 2009)
 - Reuven Wachtfogel made curl -o - properly produce a binary output on windows
   (no newline translations). Use -B/--use-ascii if you rather get the ascii
diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
index 2e55dc803776325dd939d15e386cd741d17be900..21ccc65e770c91b6ab11841aee72d9a760c20177 100644
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@@ -873,11 +873,16 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
             tmp_CFLAGS="$tmp_CFLAGS -Wdeclaration-after-statement"
           fi
           #
+          dnl Only gcc 4.2 or later
+          if test "$compiler_num" -ge "402"; then
+            tmp_CFLAGS="$tmp_CFLAGS -Wcast-align"
+          fi
           dnl Only gcc 4.3 or later
           if test "$compiler_num" -ge "403"; then
             tmp_CFLAGS="$tmp_CFLAGS -Wtype-limits -Wold-style-declaration"
             tmp_CFLAGS="$tmp_CFLAGS -Wmissing-parameter-type -Wempty-body"
             tmp_CFLAGS="$tmp_CFLAGS -Wclobbered -Wignored-qualifiers"
+            tmp_CFLAGS="$tmp_CFLAGS -Wconversion -Wno-sign-conversion -Wvla"
           fi
           #
         fi