diff --git a/ChangeLog b/ChangeLog
index 0be7e9ff..51889fb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-20  Darshit Shah  <darnir@gmail.com>
+
+	* configure.ac: Add the -Wextra flag when no CFLAGS are set
+
 2014-11-19  Tim Ruehsen <tim.ruehsen@gmx.de>
 
 	* configure.ac: Check for random()
diff --git a/configure.ac b/configure.ac
index e589b93b..93c15a32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,9 +165,11 @@ dnl   if compiler is gcc, then
 dnl     use -O2 and some warning flags
 dnl   else
 dnl     use os-specific flags or -O
+dnl
+dnl For these tests, the system considers clang to be gcc
 if test -n "$auto_cflags"; then
   if test -n "$GCC"; then
-    CFLAGS="$CFLAGS -O2 -Wall"
+    CFLAGS="$CFLAGS -O2 -Wall -Wextra"
   else
     case "$host_os" in
       *hpux*)  CFLAGS="$CFLAGS +O3"                      ;;