diff --git a/ChangeLog b/ChangeLog
index cfa9c8379..78910884b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mkfont.c: Build fix for argp.h with older gcc.
+
 2014-01-29  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/ahci.c: Increase timeout. Some SSDs take up to
diff --git a/util/grub-mkfont.c b/util/grub-mkfont.c
index 3de07ee9c..e6485b40f 100644
--- a/util/grub-mkfont.c
+++ b/util/grub-mkfont.c
@@ -33,7 +33,11 @@
 
 #ifndef GRUB_BUILD
 #define _GNU_SOURCE	1
+#pragma GCC diagnostic ignored "-Wmissing-prototypes"
+#pragma GCC diagnostic ignored "-Wmissing-declarations"
 #include <argp.h>
+#pragma GCC diagnostic error "-Wmissing-prototypes"
+#pragma GCC diagnostic error "-Wmissing-declarations"
 #endif
 #include <assert.h>