diff --git a/docs/INSTALL b/docs/INSTALL
index 43f02f64ed93a9cba71517e1d871bd6bccc78937..137b64c4293f7da7b21e72ed2a96e84172b08b0b 100644
--- a/docs/INSTALL
+++ b/docs/INSTALL
@@ -218,7 +218,7 @@ Win32
    environment variables, for example:
 
      set ZLIB_PATH=c:\zlib-1.2.6
-     set OPENSSL_PATH=c:\openssl-0.9.8v
+     set OPENSSL_PATH=c:\openssl-0.9.8w
      set LIBSSH2_PATH=c:\libssh2-1.4.1
 
    ATTENTION: if you want to build with libssh2 support you have to use latest
@@ -334,7 +334,7 @@ Win32
    Before running nmake define the OPENSSL_PATH environment variable with
    the root/base directory of OpenSSL, for example:
 
-     set OPENSSL_PATH=c:\openssl-0.9.8v
+     set OPENSSL_PATH=c:\openssl-0.9.8w
 
    Then run 'nmake vc-ssl' or 'nmake vc-ssl-dll' in curl's root
    directory.  'nmake vc-ssl' will create a libcurl static and dynamic
diff --git a/docs/examples/Makefile.m32 b/docs/examples/Makefile.m32
index 469d7a1cd5115d65da89025f5e911b261ed04bb3..930d0017cfa18fca2dd4e84aef224ddd4d05bc4a 100644
--- a/docs/examples/Makefile.m32
+++ b/docs/examples/Makefile.m32
@@ -38,7 +38,7 @@ 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.8v
+OPENSSL_PATH = ../../../openssl-0.9.8w
 endif
 ifndef OPENSSL_LIBPATH
 OPENSSL_LIBPATH = $(OPENSSL_PATH)/out
diff --git a/docs/examples/Makefile.netware b/docs/examples/Makefile.netware
index cba66a7a08f6dee28628a34cb4f3c149fc8ab2fd..b2fc329a96f712bbdb7e5b986ad5ae540e9fddec 100644
--- a/docs/examples/Makefile.netware
+++ b/docs/examples/Makefile.netware
@@ -19,7 +19,7 @@ endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../../openssl-0.9.8v
+OPENSSL_PATH = ../../../openssl-0.9.8w
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
diff --git a/lib/Makefile.Watcom b/lib/Makefile.Watcom
index 395fffbd929e3cc7e9caddb7b9b23413d4000765..9de52a8b143007d3ee91acfe613240413f71d1f1 100644
--- a/lib/Makefile.Watcom
+++ b/lib/Makefile.Watcom
@@ -101,7 +101,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
 !ifdef %openssl_root
 OPENSSL_ROOT = $(%openssl_root)
 !else
-OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8v
+OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8w
 !endif
 
 !ifdef %ares_root
diff --git a/lib/Makefile.b32 b/lib/Makefile.b32
index 37430acf21f316d9366ec0e27d218631765cf629..4c45e910c2db59520388aa219a7c9e7b1e352459 100644
--- a/lib/Makefile.b32
+++ b/lib/Makefile.b32
@@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.6
 
 # Edit the path below to point to the base of your OpenSSL package.
 !ifndef OPENSSL_PATH
-OPENSSL_PATH = ..\..\openssl-0.9.8v
+OPENSSL_PATH = ..\..\openssl-0.9.8w
 !endif
 
 # Set libcurl static lib, dll and import lib
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index adb5e5fe433e06f8ae139584472e6126dca3218f..0b04c19ef19de2d7bcdb69c181629228aa19040c 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -18,7 +18,7 @@ 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.8v
+OPENSSL_PATH = ../../openssl-0.9.8w
 endif
 ifndef OPENSSL_INCLUDE
 OPENSSL_INCLUDE = $(OPENSSL_PATH)/outinc
diff --git a/lib/Makefile.netware b/lib/Makefile.netware
index 32a1a84c31fd334e9b4d47a6e6ccc99e4e5bac1b..c7d9bc655f999fa189cde2d74367ead9205982b6 100644
--- a/lib/Makefile.netware
+++ b/lib/Makefile.netware
@@ -19,7 +19,7 @@ endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8v
+OPENSSL_PATH = ../../openssl-0.9.8w
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index e69f31a1501fb6bf4a31726985fb2421d44be0e3..cf89c1644ab28397a665f75c208f63f17059bd5a 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -65,7 +65,7 @@
 !INCLUDE ..\Makefile.msvc.names
 
 !IFNDEF OPENSSL_PATH
-OPENSSL_PATH   = ../../openssl-0.9.8v
+OPENSSL_PATH   = ../../openssl-0.9.8w
 !ENDIF
 
 !IFNDEF LIBSSH2_PATH
diff --git a/lib/Makefile.vxworks b/lib/Makefile.vxworks
index 3d555dd5c39c29d34e6b0afdff90bd10cd89d086..7e692ef76f3b38db7084bcbd2f4d12680b537a0f 100644
--- a/lib/Makefile.vxworks
+++ b/lib/Makefile.vxworks
@@ -33,8 +33,8 @@ BUILD_TYPE := debug
 USER_CFLAGS:=
 
 # directories where to seek for includes and libraries
-OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8v-vxWorks6.3/include
-OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8v-vxWorks6.3
+OPENSSL_INC := D:/libraries/openssl/openssl-0.9.8w-vxWorks6.3/include
+OPENSSL_LIB := D:/libraries/openssl/openssl-0.9.8w-vxWorks6.3
 ZLIB_INC    := D:/libraries/zlib/zlib-1.2.6-VxWorks6.3/zlib-1.2.6
 ZLIB_LIB    := D:/libraries/zlib/zlib-1.2.6-VxWorks6.3/binaries/vxworks_3.1_gnu/Debug/lib
 ARES_INC    :=
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 77fa91b4d1fab6a3ca3d5a20c715a84231428c59..b09ec6b0bdcc193149bced893ceba3923497cd79 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -90,7 +90,7 @@ LIBRTMP_ROOT = ..$(DS)..$(DS)rtmpdump-2.3
 !ifdef %openssl_root
 OPENSSL_ROOT = $(%openssl_root)
 !else
-OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8v
+OPENSSL_ROOT = ..$(DS)..$(DS)openssl-0.9.8w
 !endif
 
 !ifdef %ares_root
diff --git a/src/Makefile.b32 b/src/Makefile.b32
index 1a91c1461e8718e143bc42b726b1a244094dfa6d..ce1b766aad47a475eeeff3dab7a3172735e52a6c 100644
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -27,7 +27,7 @@ ZLIB_PATH = ..\..\zlib-1.2.6
 
 # Edit the path below to point to the base of your OpenSSL package.
 !ifndef OPENSSL_PATH
-OPENSSL_PATH = ..\..\openssl-0.9.8v
+OPENSSL_PATH = ..\..\openssl-0.9.8w
 !endif
 
 # Set program's name
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 17c6116c8eb909f3e5fb238ec52c6cc350520944..c07aa3e049fb6e8272adc75af6b25ef386e35a32 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -18,7 +18,7 @@ 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.8v
+OPENSSL_PATH = ../../openssl-0.9.8w
 endif
 ifndef OPENSSL_LIBPATH
 OPENSSL_LIBPATH = $(OPENSSL_PATH)/out
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 146d7e8e863b83596ccc859ed9814789dfb62b7f..504a68a5678420b3673c4b0cbfd0964af546fa01 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -19,7 +19,7 @@ endif
 
 # Edit the path below to point to the base of your OpenSSL package.
 ifndef OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8v
+OPENSSL_PATH = ../../openssl-0.9.8w
 endif
 
 # Edit the path below to point to the base of your LibSSH2 package.
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 4b52b1641beeb952134e1a2f34392fe5a5ce694e..036e9e3b8cfd296ab16399ba91d6528cdaabd951 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -57,7 +57,7 @@ PROGRAM_NAME = curl.exe
 
 
 !IFNDEF OPENSSL_PATH
-OPENSSL_PATH = ../../openssl-0.9.8v
+OPENSSL_PATH = ../../openssl-0.9.8w
 !ENDIF
 
 !IFNDEF ZLIB_PATH