diff --git a/ChangeLog b/ChangeLog
index 8f78477e9..42489cab7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+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
+	-Wtrampolines rather than -Wno-trampolines (since -Wno-* is always
+	accepted, but produces a diagnostic if something else is wrong).
+
 2010-11-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/term/at_keyboard.c (grub_keyboard_controller_read)
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
diff --git a/configure.ac b/configure.ac
index 1d0333a74..2f56b691f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -673,7 +673,10 @@ fi
 
 AC_CACHE_CHECK([whether -Wno-trampolines work], [grub_cv_cc_wnotrampolines], [
   SAVED_CFLAGS="$CFLAGS"
-  CFLAGS="$TARGET_CFLAGS -Wno-trampolines"
+  # Test for -Wtrampolines rather than -Wno-trampolines to reduce confusion
+  # in the event of later failures (since -Wno-* is always accepted, but
+  # produces a diagnostic if something else is wrong).
+  CFLAGS="$TARGET_CFLAGS -Wtrampolines"
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
 int va_arg_func (int fixed, va_list args);]], [[]])],
       [grub_cv_cc_wnotrampolines=yes],