diff --git a/ChangeLog b/ChangeLog
index 8b2f5556c..1faaea88b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-21  Colin Watson  <cjwatson@ubuntu.com>
+
+	* conf/Makefile.common (CPPFLAGS_GNULIB): Add
+	$(top_srcdir)/grub-core/gnulib as well as
+	$(top_builddir)/grub-core/gnulib.
+	Reported by: KESHAV P.R.
+
 2010-09-21  Colin Watson  <cjwatson@ubuntu.com>
 
 	* util/grub-install.in: Fix the bootloader ID option to be
diff --git a/conf/Makefile.common b/conf/Makefile.common
index 35f4dfa6e..ea16ab159 100644
--- a/conf/Makefile.common
+++ b/conf/Makefile.common
@@ -81,7 +81,7 @@ 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
-CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/gnulib
+CPPFLAGS_GNULIB = -I$(top_builddir)/grub-core/gnulib -I$(top_srcdir)/grub-core/gnulib
 
 CFLAGS_POSIX = -fno-builtin
 CPPFLAGS_POSIX = -I$(top_srcdir)/grub-core/lib/posix_wrap