diff -ru ../neon-0.31.1.orig/configure ./configure
--- ../neon-0.31.1.orig/configure
+++ ./configure
@@ -6258,9 +6258,9 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
-$as_echo_n "checking for library containing SSL_library_init... " >&6; }
-if ${ne_cv_libsfor_SSL_library_init+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_new" >&5
+$as_echo_n "checking for library containing SSL_new... " >&6; }
+if ${ne_cv_libsfor_SSL_new+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6270,22 +6270,22 @@
 int
 main ()
 {
-SSL_library_init();
+SSL_new(NULL);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ne_cv_libsfor_SSL_library_init="none needed"
+  ne_cv_libsfor_SSL_new="none needed"
 else
 
 ne_sl_save_LIBS=$LIBS
-ne_cv_libsfor_SSL_library_init="not found"
+ne_cv_libsfor_SSL_new="not found"
 for lib in ssl; do
     # The w32api libraries link using the stdcall calling convention.
     case ${lib}-${ne_cv_os_uname} in
-    ws2_32-MINGW*) ne__code="__stdcall SSL_library_init();" ;;
-    *) ne__code="SSL_library_init();" ;;
+    ws2_32-MINGW*) ne__code="__stdcall SSL_new();" ;;
+    *) ne__code="SSL_new();" ;;
     esac
 
     LIBS="$ne_sl_save_LIBS -l$lib $NEON_LIBS"
@@ -6301,7 +6301,7 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ne_cv_libsfor_SSL_library_init="-l$lib"; break
+  ne_cv_libsfor_SSL_new="-l$lib"; break
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -6318,7 +6318,7 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ne_cv_libsfor_SSL_library_init="-l$lib -ldl"; break
+  ne_cv_libsfor_SSL_new="-l$lib -ldl"; break
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -6328,15 +6328,15 @@
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ne_cv_libsfor_SSL_library_init" >&5
-$as_echo "$ne_cv_libsfor_SSL_library_init" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ne_cv_libsfor_SSL_new" >&5
+$as_echo "$ne_cv_libsfor_SSL_new" >&6; }
 
-if test "$ne_cv_libsfor_SSL_library_init" = "not found"; then
-   as_fn_error $? "could not find library containing SSL_library_init" "$LINENO" 5
-elif test "$ne_cv_libsfor_SSL_library_init" = "none needed"; then
+if test "$ne_cv_libsfor_SSL_new" = "not found"; then
+   as_fn_error $? "could not find library containing SSL_new" "$LINENO" 5
+elif test "$ne_cv_libsfor_SSL_new" = "none needed"; then
    :
 else
-   NEON_LIBS="$ne_cv_libsfor_SSL_library_init $NEON_LIBS"
+   NEON_LIBS="$ne_cv_libsfor_SSL_new $NEON_LIBS"
 
 fi
 else
@@ -6454,9 +6454,9 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_library_init" >&5
-$as_echo_n "checking for library containing SSL_library_init... " >&6; }
-if ${ne_cv_libsfor_SSL_library_init+:} false; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing SSL_new" >&5
+$as_echo_n "checking for library containing SSL_new... " >&6; }
+if ${ne_cv_libsfor_SSL_new+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6466,22 +6466,22 @@
 int
 main ()
 {
-SSL_library_init();
+SSL_new(NULL);
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ne_cv_libsfor_SSL_library_init="none needed"
+  ne_cv_libsfor_SSL_new="none needed"
 else
 
 ne_sl_save_LIBS=$LIBS
-ne_cv_libsfor_SSL_library_init="not found"
+ne_cv_libsfor_SSL_new="not found"
 for lib in ssl; do
     # The w32api libraries link using the stdcall calling convention.
     case ${lib}-${ne_cv_os_uname} in
-    ws2_32-MINGW*) ne__code="__stdcall SSL_library_init();" ;;
-    *) ne__code="SSL_library_init();" ;;
+    ws2_32-MINGW*) ne__code="__stdcall SSL_new();" ;;
+    *) ne__code="SSL_new();" ;;
     esac
 
     LIBS="$ne_sl_save_LIBS -l$lib $NEON_LIBS"
@@ -6497,7 +6497,7 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ne_cv_libsfor_SSL_library_init="-l$lib"; break
+  ne_cv_libsfor_SSL_new="-l$lib"; break
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -6514,7 +6514,7 @@
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ne_cv_libsfor_SSL_library_init="-l$lib -ldl"; break
+  ne_cv_libsfor_SSL_new="-l$lib -ldl"; break
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -6524,15 +6524,15 @@
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ne_cv_libsfor_SSL_library_init" >&5
-$as_echo "$ne_cv_libsfor_SSL_library_init" >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ne_cv_libsfor_SSL_new" >&5
+$as_echo "$ne_cv_libsfor_SSL_new" >&6; }
 
-if test "$ne_cv_libsfor_SSL_library_init" = "not found"; then
-   as_fn_error $? "could not find library containing SSL_library_init" "$LINENO" 5
-elif test "$ne_cv_libsfor_SSL_library_init" = "none needed"; then
+if test "$ne_cv_libsfor_SSL_new" = "not found"; then
+   as_fn_error $? "could not find library containing SSL_new" "$LINENO" 5
+elif test "$ne_cv_libsfor_SSL_new" = "none needed"; then
    :
 else
-   NEON_LIBS="$ne_cv_libsfor_SSL_library_init $NEON_LIBS"
+   NEON_LIBS="$ne_cv_libsfor_SSL_new $NEON_LIBS"
 
 fi
    fi
diff -ru ../neon-0.31.1.orig/macros/neon.m4 ./macros/neon.m4
--- ../neon-0.31.1.orig/macros/neon.m4
+++ ./macros/neon.m4
@@ -909,7 +909,7 @@
      NEON_LIBS="$NEON_LIBS ${NE_SSL_LIBS}"],
     [# Either OpenSSL library may require -ldl if built with dynamic engine support
      NE_SEARCH_LIBS(RSA_new, crypto, -ldl)
-     NE_SEARCH_LIBS(SSL_library_init, ssl, -ldl)
+     NE_SEARCH_LIBS(SSL_new, ssl, -ldl)
      NE_SSL_VERSION="(0.9.7 or later)"])
 
    AC_CHECK_HEADERS(openssl/ssl.h openssl/opensslv.h,,