diff --git a/ChangeLog b/ChangeLog
index 7eada1d49..42489cab7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-16  Colin Watson  <cjwatson@debian.org>
+
+	* conf/Makefile.common (CFLAGS_GNULIB): Add -Wno-unused-parameter.
+	(-Wunused implies -Wunused-parameter, but not vice versa).
+
 2010-11-16  Colin Watson  <cjwatson@ubuntu.com>
 
 	* configure.ac: Make error messages less confusing by testing for
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 73b3d819b..2df8465c0 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -97,7 +97,7 @@ platformdir = $(pkglibrootdir)/$(target_cpu)-$(platform)
 CFLAGS_GCRY = -Wno-error -Wno-missing-field-initializers
 CPPFLAGS_GCRY = -I$(top_srcdir)/grub-core/lib/libgcrypt_wrap
 
-CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused
+CFLAGS_GNULIB = -Wno-undef -Wno-sign-compare -Wno-unused -Wno-unused-parameter
 CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/gnulib -I$(top_srcdir)/grub-core/gnulib
 
 CFLAGS_POSIX = -fno-builtin