diff --git a/winsup/ChangeLog b/winsup/ChangeLog
index eb079134e..798f200a7 100644
--- a/winsup/ChangeLog
+++ b/winsup/ChangeLog
@@ -1,3 +1,8 @@
+2003-03-17  Christopher Faylor  <cgf@redhat.com>
+
+	* Makefile.common (w32api_lib): Default to system w32api directory if
+	w32api is missing from source.
+
 2003-03-17  Christopher Faylor  <cgf@redhat.com>
 
 	* Makefile.common: Fix typo from previous checkin.
diff --git a/winsup/Makefile.common b/winsup/Makefile.common
index 950803d60..33629c00a 100644
--- a/winsup/Makefile.common
+++ b/winsup/Makefile.common
@@ -119,6 +119,9 @@ GCC_INCLUDE:=${subst //,/,-I$(gcc_libdir)/include}
 endif
 
 nostdinc:=${shell [ -d "$(updir)/w32api" ] && echo "-nostdinc -nostdinc++"}
+ifeq (,$(nostdinc))
+override w32api_lib:=${subst //,/,${shell $(CC) -print-search-dirs | awk -F: '/^librar/{for (i = 1; i <= NF; i++) if ($$i ~ /\/lib\/*$$/) print $$i}'}/w32api}
+endif
 
 COMPILE_CXX=$(CXX) $c $(nostdinc) $(ALL_CXXFLAGS) $(GCC_INCLUDE) \
 	     -fno-rtti -fno-exceptions