diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 857fde806e..dec99230cb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-22  Joel Brobecker  <brobecker@adacore.com>
+
+	* configure.ac (build_warnings): Add -Wdeclaration-after-statement.
+	* configure: Regenerate.
+
 2012-06-20  Yao Qi  <yao@codesourcery.com>
 
 	* python/py-inferior.c: Update comments of infpy_read_memory
diff --git a/gdb/configure b/gdb/configure
index 1d03188f54..b6f4a064f8 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -12365,7 +12365,8 @@ fi
 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wformat-nonliteral -Wno-pointer-sign \
 -Wno-unused -Wunused-value -Wunused-function \
--Wno-switch -Wno-char-subscripts -Wmissing-prototypes"
+-Wno-switch -Wno-char-subscripts -Wmissing-prototypes \
+-Wdeclaration-after-statement"
 
 # Enable -Wno-format by default when using gcc on mingw since many
 # GCC versions complain about %I64.
diff --git a/gdb/configure.ac b/gdb/configure.ac
index e48ec053b3..f77aa85411 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -1850,7 +1850,8 @@ fi
 build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \
 -Wformat-nonliteral -Wno-pointer-sign \
 -Wno-unused -Wunused-value -Wunused-function \
--Wno-switch -Wno-char-subscripts -Wmissing-prototypes"
+-Wno-switch -Wno-char-subscripts -Wmissing-prototypes \
+-Wdeclaration-after-statement"
 
 # Enable -Wno-format by default when using gcc on mingw since many
 # GCC versions complain about %I64.