diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index bf24d064c7..4d31abd603 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2012-04-19  Pedro Alves  <palves@redhat.com>
+
+	* Makefile.in (INCGNU): Add -Ignulib.
+
 2012-04-19  Pedro Alves  <palves@redhat.com>
 
 	* Makefile.in (GNULIB_INCLUDE_DIR): Rename to ...
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index 94b9cae13c..1e78f98393 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -77,7 +77,7 @@ ustinc = @ustinc@
 
 # gnulib
 LIBGNU = gnulib/libgnu.a
-INCGNU = -I$(srcdir)/../gnulib
+INCGNU = -I$(srcdir)/../gnulib -Ignulib
 
 # We build gnulib directly under the gdbserver build directory, but
 # its sources don't live directly under gdbserver's source directory.