diff --git a/ChangeLog b/ChangeLog
index 5fa0e44c81..353668c9e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 27 08:38:41 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* ext/openssl/extconf.rb: add -Wall flag by default when compiler is
+	  GCC.
+
 Wed Oct 26 15:24:25 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* file.c (rb_file_join): honor input encodings than ASCII-8BIT.
diff --git a/ext/openssl/extconf.rb b/ext/openssl/extconf.rb
index 114f8058a8..8d8cee3634 100644
--- a/ext/openssl/extconf.rb
+++ b/ext/openssl/extconf.rb
@@ -22,15 +22,18 @@ dir_config("kerberos")
 message "=== OpenSSL for Ruby configurator ===\n"
 
 ##
-# Adds -Wall -DOSSL_DEBUG for compilation and some more targets when GCC is used
+# Adds -DOSSL_DEBUG for compilation and some more targets when GCC is used
 # To turn it on, use: --with-debug or --enable-debug
 #
 if with_config("debug") or enable_config("debug")
   $defs.push("-DOSSL_DEBUG") unless $defs.include? "-DOSSL_DEBUG"
+end
 
-  if CONFIG['GCC'] == 'yes'
-    $CPPFLAGS += " -Wall" unless $CPPFLAGS.split.include? "-Wall"
-  end
+##
+# Automatically adds -Wall flag for compilation when GCC is used
+#
+if CONFIG['GCC'] == 'yes'
+  $CPPFLAGS += " -Wall" unless $CPPFLAGS.split.include? "-Wall"
 end
 
 message "=== Checking for system dependent stuff... ===\n"