diff --git a/COPYING b/COPYING
new file mode 100755
index 000000000..824fd88ca
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,3 @@
+This system is distributed under the   LGPL  licence terms. For details
+visit http://www.gnu.org/copyleft/lesser.html.
+
diff --git a/Makefile.in b/Makefile.in
old mode 100644
new mode 100755
index 0d586fbf2..56cdad158
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,7 +29,7 @@ INFODIR=$(SHAREDIR)/info
 #
 # where to store documentaion files
 #
-DOCSDIR=$(SHAREDIR)/docs/yap
+DOCSDIR=$(SHAREDIR)/docs/Yap
 
 #
 # Add this flag to YAP_EXTRAS if you need the extension:
@@ -511,6 +511,10 @@ install_unix: startup.yss libYap.a
 	@INSTALL_DLLS@ $(INSTALL_DATA) -m 755 @YAPLIB@ $(DESTDIR)$(LIBDIR)
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl
+	mkdir -p $(DESTDIR)$(DOCSDIR)
+	$(INSTALL) $(srcdir)/Artistic $(DESTDIR)$(DOCSDIR)
+	$(INSTALL) $(srcdir)/README $(DESTDIR)$(DOCSDIR)
+	$(INSTALL) $(srcdir)/COPYING $(DESTDIR)$(DOCSDIR)
 	for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done
 	@INSTALL_DLLS@ (cd packages/PLStream; $(MAKE) install)
 	@INSTALL_DLLS@ (cd packages/plunit; $(MAKE) install)
@@ -546,6 +550,10 @@ install_win32: startup.yss
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/pl
 	mkdir -p $(DESTDIR)$(SHAREDIR)/Yap/swi
+	mkdir -p $(DESTDIR)$(DOCSDIR)
+	$(INSTALL) $(srcdir)/Artistic $(DESTDIR)$(DOCSDIR)
+	$(INSTALL) $(srcdir)/README $(DESTDIR)$(DOCSDIR)/README.TXT
+	$(INSTALL) $(srcdir)/COPYING $(DESTDIR)$(DOCSDIR)/COPYING.TXT
 	for f in $(PL_SOURCES); do $(INSTALL) $$f $(DESTDIR)$(SHAREDIR)/Yap/pl; done
 	$(INSTALL) $(HEADERS) $(DESTDIR)$(INCLUDEDIR)
 	for h in $(INTERFACE_HEADERS); do $(INSTALL) $$h $(DESTDIR)$(INCLUDEDIR); done
diff --git a/misc/yap.nsi b/misc/yap.nsi
old mode 100644
new mode 100755
index 289d551e0..3a7901cb3
--- a/misc/yap.nsi
+++ b/misc/yap.nsi
@@ -29,7 +29,7 @@ ComponentText "This will install YAP on your computer."
 DirText "This program will install YAP on your computer.\
          Choose a directory"
 
-LicenseData c:\Yap\share\docs\Artistic
+LicenseData c:\Yap\share\docs\Yap\Artistic
 LicenseText "YAP is governed by the Artistic License,\
 	but includes code under the GPL and LGPL."
 
@@ -53,16 +53,7 @@ Section "Base system (required)"
 
   SetOutPath $INSTDIR\bin
 ; SYSTEM STUFF
-  File c:\Yap\lib\Yap\matrix.dll
-  File c:\Yap\lib\Yap\plterm.dll
-  File c:\Yap\lib\Yap\random.dll
-  File c:\Yap\lib\Yap\regcomp.dll
-  File c:\Yap\lib\Yap\regerror.dll
-  File c:\Yap\lib\Yap\regexec.dll
-  File c:\Yap\lib\Yap\regexp.dll
-  File c:\Yap\lib\Yap\regfree.dll
-  File c:\Yap\lib\Yap\sys.dll
-  File c:\Yap\lib\Yap\yap_tries.dll
+  File c:\Yap\lib\Yap\*.dll
 
   SetOutPath $INSTDIR\lib
 ; SYSTEM STUFF
@@ -76,12 +67,12 @@ Section "Base system (required)"
 ; SYSTEM STUFF
   File /r c:\Yap\share\Yap\*
 
-  SetOutPath $INSTDIR\docs
-  File c:\Yap\share\docs\yap.html
-  File c:\Yap\share\docs\yap.pdf
-  File c:\Yap\share\docs\Artistic
-  File c:\Yap\share\docs\README.TXT
-  File c:\Yap\share\docs\COPYING.TXT
+  SetOutPath $INSTDIR\docs\Yap
+  File c:\Yap\share\docs\Yap\yap.html
+  File c:\Yap\share\docs\Yap\yap.pdf
+  File c:\Yap\share\docs\Yap\Artistic
+  File c:\Yap\share\docs\Yap\README.TXT
+  File c:\Yap\share\docs\Yap\COPYING.TXT
 
   WriteRegStr HKLM ${REGKEY} "home" "$INSTDIR"
   WriteRegStr HKLM ${REGKEY} "startup" "$INSTDIR\lib\startup.yss"
@@ -277,4 +268,4 @@ Function .onInstFailed
 		    installer, please contact yap-users@sf.net"
 FunctionEnd
 
-outfile "yap-5.1.4-installer.exe"
+outfile "yap-6.0.0-installer.exe"
diff --git a/packages/jpl b/packages/jpl
index 9f80255cc..d9614e99d 160000
--- a/packages/jpl
+++ b/packages/jpl
@@ -1 +1 @@
-Subproject commit 9f80255cce18ee268792631aa1180e19a496346f
+Subproject commit d9614e99dc98f8546fdc213c9e45003cf6efd520