diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cbf3c0cb65..d21436c8d6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-05  Pedro Alves  <palves@redhat.com>
+
+	* warning.m4 (build_warnings): Remove -Wno-write-strings.
+	* configure: Regenerate.
+
 2017-04-05  Pedro Alves  <palves@redhat.com>
 
 	* ada-exp.y (yyerror): Constify.
diff --git a/gdb/configure b/gdb/configure
index 7fbae9f34b..9f05b4bb7e 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -15108,7 +15108,7 @@ build_warnings="-Wall -Wpointer-arith \
 -Wno-unused -Wunused-value -Wunused-function \
 -Wno-switch -Wno-char-subscripts \
 -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable \
--Wno-sign-compare -Wno-write-strings -Wno-narrowing"
+-Wno-sign-compare -Wno-narrowing"
 
 # Enable -Wno-format by default when using gcc on mingw since many
 # GCC versions complain about %I64.
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index a09006a5d4..9b0c8870ff 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2017-04-05  Pedro Alves  <palves@redhat.com>
+
+	* configure: Regenerate.
+
 2017-04-05  Pedro Alves  <palves@redhat.com>
 
 	* gdbreplay.c (sync_error): Constify.
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index 6ae486539f..64f96f5444 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -7148,7 +7148,7 @@ build_warnings="-Wall -Wpointer-arith \
 -Wno-unused -Wunused-value -Wunused-function \
 -Wno-switch -Wno-char-subscripts \
 -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable \
--Wno-sign-compare -Wno-write-strings -Wno-narrowing"
+-Wno-sign-compare -Wno-narrowing"
 
 # Enable -Wno-format by default when using gcc on mingw since many
 # GCC versions complain about %I64.
diff --git a/gdb/warning.m4 b/gdb/warning.m4
index f04709edde..83f69ec229 100644
--- a/gdb/warning.m4
+++ b/gdb/warning.m4
@@ -40,7 +40,7 @@ build_warnings="-Wall -Wpointer-arith \
 -Wno-unused -Wunused-value -Wunused-function \
 -Wno-switch -Wno-char-subscripts \
 -Wempty-body -Wunused-but-set-parameter -Wunused-but-set-variable \
--Wno-sign-compare -Wno-write-strings -Wno-narrowing"
+-Wno-sign-compare -Wno-narrowing"
 
 # Enable -Wno-format by default when using gcc on mingw since many
 # GCC versions complain about %I64.