diff --git a/winsup/cygserver/ChangeLog b/winsup/cygserver/ChangeLog
index 3f8566fd5..15ac84dde 100644
--- a/winsup/cygserver/ChangeLog
+++ b/winsup/cygserver/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-03  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* Makefile.in (CFLAGS): Look in cygwin's build directory for header
+	files.
+
 2008-12-15  Corinna Vinschen  <corinna@vinschen.de>
 
 	* setpwd.cc (client_request_setpwd::serve): Don't treat removing
diff --git a/winsup/cygserver/Makefile.in b/winsup/cygserver/Makefile.in
index 4192bda49..8743f6451 100644
--- a/winsup/cygserver/Makefile.in
+++ b/winsup/cygserver/Makefile.in
@@ -1,5 +1,5 @@
 # Makefile for Cygwin server
-# Copyright 2003, 2006, 2007 Red Hat, Inc.
+# Copyright 2003, 2006, 2007, 2008, 2009 Red Hat, Inc.
 
 # This file is part of Cygwin.
 
@@ -80,7 +80,7 @@ $(cygwin_build)/%.o: $(cygwin_source)/%.c
 Makefile: Makefile.in configure
 
 lib%.o: %.cc
-	${filter-out -D__OUTSIDE_CYGWIN__, $(COMPILE_CXX)} -c -I$(updir)/cygwin -o $(@D)/${basename $(@F)}$o $<
+	${filter-out -D__OUTSIDE_CYGWIN__, $(COMPILE_CXX)} -c -I$(updir)/cygwin -I$(bupdir)/cygwin -o $(@D)/${basename $(@F)}$o $<
 
 libcygserver.a: $(LIBOBJS)
 	$(AR) crus $@ $?