diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index dcce7f05d..3111b73b0 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,4 +1,10 @@
 
+2001-03-01  Earnie Boyd  <earnie@users.sourceforge.net
+
+	* Makefile.in: (snapshot): Add target.
+	* lib/Makefile.in: (install-headers): Use installdir variable.
+	(installdir): Set value based on target-alias.
+
 2001-02-21  Earnie Boyd  <earnie@users.sourceforge.net
 
 	* include/w32api.h: (_W32API_VERSION): Remove.
diff --git a/winsup/w32api/Makefile.in b/winsup/w32api/Makefile.in
index baab75016..0765891bb 100644
--- a/winsup/w32api/Makefile.in
+++ b/winsup/w32api/Makefile.in
@@ -83,7 +83,11 @@ install uninstall:
 		(cd $$i; $(MAKE) $@); \
 	done
 
-distdir = $(PACKAGE)-$(VERSION)
+ifdef SNAPDATE
+    distdir = $(PACKAGE)-$(VERSION)-$(SNAPDATE)
+else
+    distdir = $(PACKAGE)-$(VERSION)
+endif
 
 dist: srcdist bindist
 
@@ -108,6 +112,9 @@ bindist:
 	rm -f $(distdir).tar.gz
 	cd $(distdir); $(TAR) czf ../$(distdir).tar.gz .
 
+snapshot:
+	make dist SNAPDATE=$(shell date '+%Y%m%d')
+
 Makefile: Makefile.in config.status configure
 	$(SHELL) config.status
 
diff --git a/winsup/w32api/lib/Makefile.in b/winsup/w32api/lib/Makefile.in
index 6749b4e52..ec1942456 100644
--- a/winsup/w32api/lib/Makefile.in
+++ b/winsup/w32api/lib/Makefile.in
@@ -35,7 +35,11 @@ tooldir:=$(exec_prefix)/$(target_alias)
 endif
 datadir = @datadir@
 infodir = @infodir@
+ifneq (,$(findstring cygwin,$(target_alias)))
+includedir = $(tooldir)/include/w32api
+else
 includedir = @includedir@
+endif
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -144,9 +148,9 @@ install-libraries: all
 	done
 
 install-headers:
-	$(mkinstalldirs) $(tooldir)/include/w32api
+	$(mkinstalldirs) $(includedir)
 	for i in $(HEADERS); do \
-		$(INSTALL_DATA) $(srcdir)/../include/$$i $(tooldir)/include/w32api/$$i ; \
+		$(INSTALL_DATA) $(srcdir)/../include/$$i $(includedir)/$$i ; \
 	done
 
 # uninstall headers and libraries from a target specified directory