diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 6624dc23e..b0e7f4642 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-13  Earnie Boyd  <earnie@SF.net>
+
+	* lib/Makefile.in (inst_includedir): Change to always use w32api
+	subdirectory for target == cygwin.
+	(inst_libdir): Ditto.
+
 2001-09-13  Earnie Boyd  <earnie@SF.net>
 
 	* lib/Makefile.in (config_prefix): New variable.
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index 9ece33902..593dabbd5 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -40,8 +40,8 @@ infodir = @infodir@
 ifneq (,$(findstring cygwin,$(target_alias)))
 ifeq ($(build_alias),$(host_alias))
 ifeq ($(prefix),$(config_prefix))
-inst_includedir:=$(includedir)
-inst_libdir:=$(libdir)
+inst_includedir:=$(tooldir)/include/w32api
+inst_libdir:=$(tooldir)/lib/w32api
 else
 inst_includedir:=$(tooldir)/usr/include/w32api
 inst_libdir:=$(tooldir)/usr/lib/w32api