diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 9c26a1d26..6624dc23e 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-13  Earnie Boyd  <earnie@SF.net>
+
+	* lib/Makefile.in (config_prefix): New variable.
+	(inst_includedir): Manipulate special value only if target == cygwin
+	and build == target and prefix != config_prefix.
+	(inst_libdir): Ditto.
+
 2001-09-12  Earnie Boyd  <earnie@SF.net>
 
 	* Makefile.in (TARFLAGS): New variable.
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index a7ec2e2f0..9ece33902 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -19,6 +19,7 @@ host_alias = @host_alias@
 build_alias = @build_alias@
 target_alias = @target_alias@
 prefix = @prefix@
+config_prefix = @prefix@
 includedir:=@includedir@
 
 program_transform_name = @program_transform_name@
@@ -37,8 +38,18 @@ endif
 datadir = @datadir@
 infodir = @infodir@
 ifneq (,$(findstring cygwin,$(target_alias)))
+ifeq ($(build_alias),$(host_alias))
+ifeq ($(prefix),$(config_prefix))
+inst_includedir:=$(includedir)
+inst_libdir:=$(libdir)
+else
 inst_includedir:=$(tooldir)/usr/include/w32api
 inst_libdir:=$(tooldir)/usr/lib/w32api
+endif
+else
+inst_includedir:=$(includedir)
+inst_libdir:=$(libdir)
+endif
 else
 inst_includedir:=$(includedir)
 inst_libdir:=$(libdir)