diff --git a/ChangeLog b/ChangeLog
index 6be5c5d67b..e16451af05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-11-01  Steve Ellcey  <sellcey@caviumnetworks.com>
+
+	* stdio-common/tst-printf.c: Ignore -Wformat-length warning.
+
 2016-11-01  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #19673]
diff --git a/stdio-common/tst-printf.c b/stdio-common/tst-printf.c
index 2896b18ecd..ffe7ac7753 100644
--- a/stdio-common/tst-printf.c
+++ b/stdio-common/tst-printf.c
@@ -32,6 +32,11 @@
    The compiler warnings are not useful here.  */
 DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
 
+#if __GNUC_PREREQ (7, 0)
+/* Compiler warnings about format lengths should also be ignored.  */
+DIAG_IGNORE_NEEDS_COMMENT (7.0, "-Wformat-length");
+#endif
+
 static void rfg1 (void);
 static void rfg2 (void);
 static void rfg3 (void);