diff --git a/ChangeLog b/ChangeLog
index b04a4ef70..8534158b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub-mount.c: Extend GCC warning workaround to grub-mount.
+
 2014-01-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/efi/efi.c: Ensure that the result starts with /
diff --git a/util/grub-mount.c b/util/grub-mount.c
index 118881e0d..19de2e620 100644
--- a/util/grub-mount.c
+++ b/util/grub-mount.c
@@ -41,8 +41,13 @@
 #include <string.h>
 #include <stdlib.h>
 
+#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"
+
 #include "progname.h"
-#include "argp.h"
 
 static const char *root = NULL;
 grub_device_t dev = NULL;