diff --git a/ChangeLog b/ChangeLog
index 4792506a9..33e87f310 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* configure.ac: Update CPPFLAGS and not CFLAGS when checking for
+	ft2build.h.
+
 2010-03-06  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* normal/cmdline.c (grub_cmdline_get): Fix gabled line after
diff --git a/configure.ac b/configure.ac
index cf43608d1..6deac6c6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -696,11 +696,11 @@ fi
 
 if test x"$grub_mkfont_excuse" = x ; then
   # Check for freetype libraries.
-  SAVED_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS $freetype_cflags"
+  SAVED_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $freetype_cflags"
   AC_CHECK_HEADERS([ft2build.h], [],
   	[grub_mkfont_excuse=["need freetype2 headers"]])
-  CFLAGS="$SAVED_CFLAGS"
+  CPPFLAGS="$SAVED_CPPFLAGS"
 fi
 
 if test x"$enable_grub_mkfont" = xyes && test x"$grub_mkfont_excuse" != x ; then