diff --git a/ChangeLog.gettext b/ChangeLog.gettext
index 402d93250..966bf8e7d 100644
--- a/ChangeLog.gettext
+++ b/ChangeLog.gettext
@@ -4,3 +4,7 @@
 	* acinclude.m4: ... to here.
 	* autogen.sh: Add call to `aclocal'.
 	* configure.ac: Add AM_INIT_AUTOMAKE() after AC_INIT() call.
+
+	* conf/common.rmk (grub_mkisofs_CFLAGS): Move `-I$(srcdir)/gnulib'
+	from here ...
+	* Makefile.in (CPPFLAGS): ... to here.
diff --git a/Makefile.in b/Makefile.in
index 6f08d5a6f..3a4c158c6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,7 +71,7 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 ASFLAGS = @ASFLAGS@
 LDFLAGS = @LDFLAGS@
-CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/include -Wall -W \
+CPPFLAGS = @CPPFLAGS@ -I$(builddir) -I$(builddir)/include -I$(srcdir)/gnulib -I$(srcdir)/include -Wall -W \
 	 -DGRUB_LIBDIR=\"$(pkglibdir)\"
 TARGET_CC = @TARGET_CC@
 TARGET_CFLAGS = @TARGET_CFLAGS@
diff --git a/conf/common.rmk b/conf/common.rmk
index a66bd97fd..57b47a669 100644
--- a/conf/common.rmk
+++ b/conf/common.rmk
@@ -38,7 +38,7 @@ grub_mkisofs_SOURCES = util/mkisofs/eltorito.c 				\
 	\
 	gnulib/fnmatch.c gnulib/getopt1.c gnulib/getopt.c
 grub_mkisofs_CFLAGS = -D_FILE_OFFSET_BITS=64 				\
-	-I$(srcdir)/util/mkisofs/include -I$(srcdir)/gnulib		\
+	-I$(srcdir)/util/mkisofs/include				\
 	-Wno-all -Werror
 
 # For grub-fstest.