--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,6 @@
 ##
 # @file Makefile.in
-# Copyright (C) 2012 MinGW.org Project
+# Copyright (C) 2012-2013 MinGW.org Project
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -41,6 +41,8 @@
 libdir=@libdir@
 includedir=@includedir@
 docdir=@docdir@
+mingwrtdocdir=$(docdir)/../mingwrt
+w32apidocdir=$(docdir)/../w32api
 
 mkinstalldirs=@MKDIR_P@
 
@@ -152,7 +154,7 @@
 lib_OBJECTS := $(crt0_OBJECTS) $(gcrt0_OBJECTS)
 
 bin_LIBRARIES := mingwm10.dll
-doc_DOCUMENTS := README LICENSE
+doc_DOCUMENTS := ChangeLog README LICENSE NEWS TODO NOTES
 doc_DOCUMENTS_EXTRA := doc/historical/mingw doc/historical/w32api
 
 libuuid_a_SOURCES := $(addprefix src/libuuid/,$(notdir $(wildcard ${top_srcdir}/src/libuuid/*.c)))
@@ -926,7 +928,9 @@
 install-mingwrt-dirs: $(need-DESTDIR-compatibility)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/mingwrt
+	$(mkinstalldirs) $(DESTDIR)$(mingwrtdocdir)
+	$(mkinstalldirs) $(DESTDIR)$(mingwrtdocdir)/historical
+	rmdir $(DESTDIR)$(mingwrtdocdir)/../mingw-org-wsl
 	$(mkinstalldirs) $(DESTDIR)$(includedir)
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/sys
 
@@ -961,9 +965,7 @@
 	for OBJ in $(mingwrt_lib_OBJECTS); do \
 	  $(INSTALL) $(INSTALL_FLAGS) $$OBJ $(DESTDIR)$(libdir)/ ; \
 	done
-	cp -af $(top_srcdir)/doc/historical/mingw/* $(DESTDIR)$(prefix)/share/doc/mingwrt ;
-	rm -f $(DESTDIR)$(prefix)/share/doc/mingwrt/ChangeLog
-	rm -rf $(DESTDIR)$(prefix)/share/doc/mingwrt/man
+	cp -af $(top_srcdir)/doc/historical/mingw/* $(DESTDIR)$(mingwrtdocdir)/historical/ ;
 
 dist: all dist-mingwrt dist-w32api dist-wsl
 
@@ -984,7 +986,7 @@
 	tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-dll.tar.lzma bin/*.dll
 else
 	cd ./dist/mingwrt/installed ; \
-	tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dll.tar.lzma bin/*.dll
+	tar acf ../packages/$(RELEASE_STATUS)_mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dll.tar.lzma bin/*.dll
 endif
 
 dist-mingwrt-dev: dist-mingwrt-mkdir dist-mingwrt-install
@@ -993,30 +995,36 @@
 	tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-dev.tar.lzma include/ lib/
 else
 	cd ./dist/mingwrt/installed ; \
-	tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dev.tar.lzma include/ lib/
+	tar acf ../packages/$(RELEASE_STATUS)_mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dev.tar.lzma include/ lib/
 endif
 
-$(DESTDIR)$(prefix)/share/doc/mingwrt/DISCLAIMER: dist-mingwrt-mkdir dist-mingwrt-install
-	cp $(top_srcdir)/doc/historical/mingw/DISCLAIMER $(DESTDIR)$(prefix)/share/doc/mingwrt/
-
-dist-mingwrt-lic: $(DESTDIR)$(prefix)/share/doc/mingwrt/DISCLAIMER
+$(DESTDIR)$(mingwrtdocdir)/LICENSE: dist-mingwrt-mkdir dist-mingwrt-install
+	cp $(top_srcdir)/LICENSE $(DESTDIR)$(mingwrtdocdir)
+
+dist-mingwrt-lic: $(DESTDIR)$(mingwrtdocdir)/LICENSE
 ifeq ($(RELEASE_STATUS),prod)
 	cd ./dist/mingwrt/installed ; \
-	tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-lic.tar.lzma share/doc/mingwrt/DISCLAIMER
+	tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-lic.tar.lzma share/doc/mingwrt/LICENSE
 else
 	cd ./dist/mingwrt/installed ; \
-	tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-lic.tar.lzma share/doc/mingwrt/DISCLAIMER
+	tar acf ../packages/$(RELEASE_STATUS)_mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-lic.tar.lzma share/doc/mingwrt/LICENSE
 endif
 
 dist-mingwrt-doc: dist-mingwrt-install
 ifeq ($(RELEASE_STATUS),prod)
+	for DOC in $(doc_DOCUMENTS); do \
+	  $(INSTALL) $(INSTALL_FLAGS) $(top_srcdir)/$$DOC $(DESTDIR)$(mingwrtdocdir)/$$DOC ; \
+	done
 	cd ./dist/mingwrt/installed ; \
-	rm -f share/doc/mingwrt/DISCLAIMER ; \
-	tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-doc.tar.lzma share/doc/mingwrt
+	rm -f share/doc/mingwrt/LICENSE ; \
+	tar acf ../packages/$(RELEASE_STATUS)_mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-doc.tar.lzma share/doc/mingwrt
 else
+	for DOC in $(doc_DOCUMENTS); do \
+	  $(INSTALL) $(INSTALL_FLAGS) $(top_srcdir)/$$DOC $(DESTDIR)$(mingwrtdocdir)/$$DOC ; \
+	done
 	cd ./dist/mingwrt/installed ; \
-	rm -f share/doc/mingwrt/DISCLAIMER ; \
-	tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-doc.tar.lzma share/doc/mingwrt
+	rm -f share/doc/mingwrt/LICENSE ; \
+	tar acf ../packages/$(RELEASE_STATUS)_mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-doc.tar.lzma share/doc/mingwrt
 endif
 
 dist-mingwrt-src:
@@ -1045,15 +1053,17 @@
 	find . -type f -name \*.bak -delete ; \
 	find . -type f -name .\*.swp -delete ; \
 	cd .. ; \
-	rm -rf mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
-	mv mingw.org-wsl mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
-	tar acf ../packages/mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src.tar.lzma mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src
+	rm -rf $(RELEASE_STATUS)_mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
+	mv mingw.org-wsl $(RELEASE_STATUS)_mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
+	tar acf ../packages/$(RELEASE_STATUS)_mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src.tar.lzma $(RELEASE_STATUS)_mingwrt-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src
 endif
 
 install-w32api-dirs: $(need-DESTDIR-compatibility)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/doc/w32api
+	$(mkinstalldirs) $(DESTDIR)$(w32apidocdir)
+	$(mkinstalldirs) $(DESTDIR)$(w32apidocdir)/historical
+	rmdir $(DESTDIR)$(w32apidocdir)/../mingw-org-wsl
 	$(mkinstalldirs) $(DESTDIR)$(includedir)
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/ddk
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/gdiplus
@@ -1164,8 +1174,7 @@
 	for LIB in $(w32api_lib_LIBRARIES); do \
 	  $(INSTALL) $(INSTALL_FLAGS) $$LIB $(DESTDIR)$(libdir)/ ; \
 	done
-	cp -af $(top_srcdir)/doc/historical/w32api/* $(DESTDIR)$(prefix)/share/doc/w32api ;
-	rm -f $(DESTDIR)$(prefix)/share/doc/w32api/ChangeLog
+	cp -af $(top_srcdir)/doc/historical/w32api/* $(DESTDIR)$(w32apidocdir)/historical/ ;
 
 dist-w32api:
 	$(MAKE) prefix=./dist/w32api/installed _dist-w32api-all_
@@ -1184,25 +1193,36 @@
 	tar acf ../packages/w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-dev.tar.lzma include/ lib/
 else
 	cd ./dist/w32api/installed ; \
-	tar acf ../packages/w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dev.tar.lzma include/ lib/
+	tar acf ../packages/$(RELEASE_STATUS)_w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dev.tar.lzma include/ lib/
 endif
 
-dist-w32api-lic: dist-w32api-install
+$(DESTDIR)$(w32apidocdir)/LICENSE: dist-w32api-mkdir dist-w32api-install
+	cp $(top_srcdir)/LICENSE $(DESTDIR)$(w32apidocdir)
+
+dist-w32api-lic: $(DESTDIR)$(w32apidocdir)/LICENSE
 ifeq ($(RELEASE_STATUS),prod)
 	cd ./dist/w32api/installed ; \
-	tar acf ../packages/w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-lic.tar.lzma share/doc/w32api/README.w32api
+	tar acf ../packages/w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-lic.tar.lzma share/doc/w32api/LICENSE
 else
 	cd ./dist/w32api/installed ; \
-	tar acf ../packages/w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-lic.tar.lzma share/doc/w32api/README.w32api
+	tar acf ../packages/$(RELEASE_STATUS)_w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-lic.tar.lzma share/doc/w32api/LICENSE
 endif
 
 dist-w32api-doc: dist-w32api-install
 ifeq ($(RELEASE_STATUS),prod)
+	for DOC in $(doc_DOCUMENTS); do \
+	  $(INSTALL) $(INSTALL_FLAGS) $(top_srcdir)/$$DOC $(DESTDIR)$(w32apidocdir)/$$DOC ; \
+	done
 	cd ./dist/w32api/installed ; \
-	tar acf ../packages/w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-doc.tar.lzma share/doc/w32api/CONTRIBUTIONS share/doc/w32api/TODO
+	rm -f share/doc/w32api/LICENSE ; \
+	tar acf ../packages/w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-doc.tar.lzma share/doc/w32api
 else
+	for DOC in $(doc_DOCUMENTS); do \
+	  $(INSTALL) $(INSTALL_FLAGS) $(top_srcdir)/$$DOC $(DESTDIR)$(w32apidocdir)/$$DOC ; \
+	done
 	cd ./dist/w32api/installed ; \
-	tar acf ../packages/w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-doc.tar.lzma share/doc/w32api/CONTRIBUTIONS share/doc/w32api/TODO
+	rm -f share/doc/w32api/LICENSE ; \
+	tar acf ../packages/$(RELEASE_STATUS)_w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-doc.tar.lzma share/doc/w32api
 endif
 
 dist-w32api-src:
@@ -1231,15 +1251,16 @@
 	find . -type f -name \*.bak -delete ; \
 	find . -type f -name .\*.swp -delete ; \
 	cd .. ; \
-	rm -rf w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
-	mv mingw.org-wsl w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
-	tar acf ../packages/w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src.tar.lzma w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src
+	rm -rf $(RELEASE_STATUS)_w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
+	mv mingw.org-wsl $(RELEASE_STATUS)_w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
+	tar acf ../packages/$(RELEASE_STATUS)_w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src.tar.lzma $(RELEASE_STATUS)_w32api-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src
 endif
 
 install-wsl-dirs: $(need-DESTDIR-compatibility)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	$(mkinstalldirs) $(DESTDIR)$(libdir)
 	$(mkinstalldirs) $(DESTDIR)$(docdir)
+	$(mkinstalldirs) $(DESTDIR)$(docdir)/historical
 	$(mkinstalldirs) $(DESTDIR)$(includedir)
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/sys
 	$(mkinstalldirs) $(DESTDIR)$(includedir)/ddk
@@ -1279,7 +1300,7 @@
 	done
 	cp -af $(top_srcdir)/LICENSE $(DESTDIR)$(docdir)
 	cp -af $(top_srcdir)/README $(DESTDIR)$(docdir)
-	cp -af $(top_srcdir)/doc/historical $(DESTDIR)$(docdir)
+	cp -af $(top_srcdir)/doc/historical/* $(DESTDIR)$(docdir)/historical
 
 dist-wsl:
 	$(MAKE) prefix=./dist/wsl/installed _dist-wsl-all_
@@ -1298,16 +1319,16 @@
 	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-dll.tar.lzma bin/*.dll ;
 else
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dll.tar.lzma bin/*.dll ;
+	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dll.tar.lzma bin/*.dll ;
 endif
 
 dist-wsl-dev: dist-wsl-install
 ifeq ($(RELEASE_STATUS),prod)
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-dev.tar.lzma include/ lib/
+	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-dev.tar.lzma include/ lib/
 else
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dev.tar.lzma include/ lib/
+	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-dev.tar.lzma include/ lib/
 endif
 
 dist-wsl-lic: dist-wsl-install
@@ -1316,7 +1337,7 @@
 	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-lic.tar.lzma share/doc/mingw.org-wsl/LICENSE
 else
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-lic.tar.lzma share/doc/mingw.org-wsl/LICENSE
+	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-lic.tar.lzma share/doc/mingw.org-wsl/LICENSE
 endif
 
 dist-wsl-doc: dist-wsl-install
@@ -1325,7 +1346,7 @@
 	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-doc.tar.lzma share/doc/mingw.org-wsl/README
 else
 	cd ./dist/wsl/installed ; \
-	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-doc.tar.lzma share/doc/mingw.org-wsl/README
+	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-doc.tar.lzma share/doc/mingw.org-wsl/README
 endif
 
 dist-wsl-src: dist-wsl-install
@@ -1354,7 +1375,7 @@
 	find . -type f -name \*.bak -delete ; \
 	find . -type f -name .\*.swp -delete ; \
 	cd .. ; \
-	rm -rf mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
-	mv mingw.org-wsl mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
-	tar acf ../packages/mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src.tar.lzma mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src
+	rm -rf $(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
+	mv mingw.org-wsl $(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src ; \
+	tar acf ../packages/$(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src.tar.lzma $(RELEASE_STATUS)_mingw.org-wsl-$(PACKAGE_VERSION)-$(PACKAGE_RELEASE)-mingw32-$(RELEASE_STATUS)-$(RELEASE_REFERENCE)-src
 endif