diff --git a/nw/Makefile.netware b/nw/Makefile.netware
index cc2ea28d..debe1e8d 100644
--- a/nw/Makefile.netware
+++ b/nw/Makefile.netware
@@ -14,12 +14,12 @@ endif
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.5
+ZLIB_PATH = ../../zlib-1.2.6
 endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8r
+OPENSSL_PATH = ../../openssl-0.9.8u
 endif
 
 # Edit the path below to point to your Distribution folder.
@@ -229,9 +229,11 @@ $(OBJDIR)/version.inc: ../include/libssh2.h $(OBJDIR)
 
 dist: all $(DISTDIR) $(DISTDIR)/readme.txt
 	@-$(MD) $(DISTDIR)$(DS)bin
+	@-$(CP) ../AUTHORS $(DISTDIR)
 	@-$(CP) ../COPYING $(DISTDIR)
 	@-$(CP) ../INSTALL $(DISTDIR)
 	@-$(CP) ../README $(DISTDIR)
+	@-$(CP) ../RELEASE-NOTES $(DEVLDIR)
 	@$(CP) $(TARGET).nlm $(DISTDIR)/bin
 	@echo Creating $(DISTARC)
 	@$(ZIP) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt
@@ -240,9 +242,11 @@ dev: all $(DEVLDIR) $(DEVLDIR)/readme.txt
 	@-$(MD) $(DEVLDIR)$(DS)bin
 	@-$(MD) $(DEVLDIR)$(DS)include
 	@-$(MD) $(DEVLDIR)$(DS)nw
+	@-$(CP) ../AUTHORS $(DISTDIR)
 	@-$(CP) ../COPYING $(DISTDIR)
 	@-$(CP) ../INSTALL $(DEVLDIR)
 	@-$(CP) ../README $(DEVLDIR)
+	@-$(CP) ../RELEASE-NOTES $(DEVLDIR)
 	@$(CP) $(TARGET).nlm $(DEVLDIR)/bin
 	@$(CP) ../include/*.h $(DEVLDIR)/include
 	@$(CP) libssh2_config.h $(DEVLDIR)/include
diff --git a/nw/test/Makefile.netware b/nw/test/Makefile.netware
index a728bec8..56f0e449 100644
--- a/nw/test/Makefile.netware
+++ b/nw/test/Makefile.netware
@@ -14,12 +14,12 @@ endif
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../../zlib-1.2.5
+ZLIB_PATH = ../../../zlib-1.2.6
 endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../../openssl-0.9.8r
+OPENSSL_PATH = ../../../openssl-0.9.8u
 endif
 
 # Edit the var below to enable static linking of libssh2 and libz
diff --git a/win32/GNUmakefile b/win32/GNUmakefile
index 5c2f5c97..ca123d04 100644
--- a/win32/GNUmakefile
+++ b/win32/GNUmakefile
@@ -9,14 +9,14 @@
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../zlib-1.2.5
+ZLIB_PATH = ../../zlib-1.2.6
 endif
 # since currently always enabled in libssh2_config.h set here too!
 WITH_ZLIB = 1
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8r
+OPENSSL_PATH = ../../openssl-0.9.8u
 endif
 
 # Edit the var below to set to your architecture or set environment var.
@@ -72,7 +72,7 @@ DS	= /
 else
 CP	= copy
 RM	= del /q /f 2>NUL
-MD	= md
+MD	= md 2>NUL
 RD	= rd /q /s 2>NUL
 XX	=
 DS	= $(XX)\$(XX)
@@ -172,9 +172,11 @@ $(OBJDIR)/version.inc: ../include/libssh2.h $(OBJDIR)
 
 dist: all $(DISTDIR) $(DISTDIR)/readme.txt
 	@-$(MD) $(DISTDIR)$(DS)bin
+	@-$(CP) ..$(DS)AUTHORS $(DISTDIR)
+	@-$(CP) ..$(DS)COPYING $(DISTDIR)
 	@-$(CP) ..$(DS)INSTALL $(DISTDIR)
-	@-$(CP) ..$(DS)LICENSE $(DISTDIR)
 	@-$(CP) ..$(DS)README $(DISTDIR)
+	@-$(CP) ..$(DS)RELEASE-NOTES $(DEVLDIR)
 	@$(CP) $(TARGET).dll $(DISTDIR)$(DS)bin
 	@echo Creating $(DISTARC)
 	@$(ZIP) $(DISTARC) $(DISTDIR)/* < $(DISTDIR)/readme.txt
@@ -183,9 +185,11 @@ dev: all $(DEVLDIR) $(DEVLDIR)/readme.txt
 	@-$(MD) $(DEVLDIR)$(DS)bin
 	@-$(MD)$(DEVLDIR)$(DS)include
 	@-$(MD) $(DEVLDIR)$(DS)win32
+	@-$(CP) ..$(DS)AUTHORS $(DISTDIR)
+	@-$(CP) ..$(DS)COPYING $(DISTDIR)
 	@-$(CP) ..$(DS)INSTALL $(DEVLDIR)
-	@-$(CP) ..$(DS)LICENSE $(DEVLDIR)
 	@-$(CP) ..$(DS)README $(DEVLDIR)
+	@-$(CP) ..$(DS)RELEASE-NOTES $(DEVLDIR)
 	@$(CP) $(TARGET).dll $(DEVLDIR)$(DS)bin
 	@$(CP) ..$(DS)include$(DS)*.h $(DEVLDIR)$(DS)include
 	@$(CP) libssh2_config.h $(DEVLDIR)/include
diff --git a/win32/Makefile.Watcom b/win32/Makefile.Watcom
index 25ac5f1a..9039e531 100644
--- a/win32/Makefile.Watcom
+++ b/win32/Makefile.Watcom
@@ -64,13 +64,13 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6
 !ifdef %zlib_root
 ZLIB_ROOT = $(%zlib_root)
 !else
-ZLIB_ROOT = ..\..\zlib-1.2.5
+ZLIB_ROOT = ..\..\zlib-1.2.6
 !endif
 
 !ifdef %openssl_root
 OPENSSL_ROOT = $(%openssl_root)
 !else
-OPENSSL_ROOT = ..\..\openssl-0.9.8r
+OPENSSL_ROOT = ..\..\openssl-0.9.8u
 !endif
 
 #!ifdef %use_zlib
diff --git a/win32/config.mk b/win32/config.mk
index 28266ea0..85f4b836 100644
--- a/win32/config.mk
+++ b/win32/config.mk
@@ -1,10 +1,10 @@
 
 # Tweak these for your system
-OPENSSLINC=..\openssl-0.9.8q\inc32
-OPENSSLLIB=..\openssl-0.9.8q\out32dll
+OPENSSLINC=..\openssl-0.9.8u\inc32
+OPENSSLLIB=..\openssl-0.9.8u\out32dll
 
-ZLIBINC=-DLIBSSH2_HAVE_ZLIB=1 /I..\zlib-1.2.5
-ZLIBLIB=..\zlib-1.2.5
+ZLIBINC=-DLIBSSH2_HAVE_ZLIB=1 /I..\zlib-1.2.6
+ZLIBLIB=..\zlib-1.2.6
 
 !if "$(TARGET)" == ""
 TARGET=Release
diff --git a/win32/test/GNUmakefile b/win32/test/GNUmakefile
index 6a900a3a..c922a65b 100644
--- a/win32/test/GNUmakefile
+++ b/win32/test/GNUmakefile
@@ -9,12 +9,12 @@
 
 # Edit the path below to point to the base of your Zlib sources.
 ifndef ZLIB_PATH
-ZLIB_PATH = ../../../zlib-1.2.5
+ZLIB_PATH = ../../../zlib-1.2.6
 endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../../openssl-0.9.8r
+OPENSSL_PATH = ../../../openssl-0.9.8u
 endif
 
 # Edit the var below to set to your architecture or set environment var.
@@ -61,7 +61,7 @@ DS      = /
 else
 CP      = copy
 RM      = del /q /f 2>NUL
-MD      = md
+MD      = md 2>NUL
 RD      = rd /q /s 2>NUL
 XX      =
 DS      = $(XX)\$(XX)