diff --git a/ChangeLog b/ChangeLog
index dd1fda8d6..a0a81b198 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-05  Grégoire Sutre  <gregoire.sutre@gmail.com>
+
+	* configure.ac: Strengthen the test for working -nostdinc -isystem.
+
 2012-07-31  Grégoire Sutre  <gregoire.sutre@gmail.com>
 
 	* po/POTFILES.in: Regenerated.
diff --git a/configure.ac b/configure.ac
index 91b36d0a4..190665df8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -717,6 +717,7 @@ AC_CACHE_CHECK([whether -nostdinc -isystem works], [grub_cv_cc_isystem], [
   SAVED_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$TARGET_CPPFLAGS -nostdinc -isystem `$TARGET_CC -print-file-name=include`"
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stdarg.h>
+#include <stddef.h>
 int va_arg_func (int fixed, va_list args);]], [[]])],
       [grub_cv_cc_isystem=yes],
       [grub_cv_cc_isystem=no])