diff --git a/ChangeLog b/ChangeLog
index b9ee422bea2..24ff1b50abf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge from gnulib, incorporating:
+	2014-01-02 manywarnings: remove -Wmudflap
+	This ports better to GCC 4.9-to-be.
+
 2013-12-31  Fabrice Popineau  <fabrice.popineau@supelec.fr>
 
 	* configure.ac (canonical, C_SWITCH_SYSTEM): Support a 64-bit
diff --git a/m4/manywarnings.m4 b/m4/manywarnings.m4
index 8339d40f8f9..e1cee6cf9d1 100644
--- a/m4/manywarnings.m4
+++ b/m4/manywarnings.m4
@@ -146,7 +146,6 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC],
     -Wmissing-include-dirs \
     -Wmissing-parameter-type \
     -Wmissing-prototypes \
-    -Wmudflap \
     -Wmultichar \
     -Wnarrowing \
     -Wnested-externs \