diff --git a/src/configure b/src/configure
index 5ff174752..a698ae8bb 100755
--- a/src/configure
+++ b/src/configure
@@ -648,7 +648,7 @@ EGREP
 GREP
 CPP
 LIBICONV
-ERLANG_SSL39
+ERLANG_SSLVER
 ERLANG_LIBS
 ERLANG_CFLAGS
 ERL
@@ -3211,7 +3211,6 @@ fi
 -author('alexey@sevcom.net').
 
 -export([start/0]).
--include_lib("ssl/include/ssl_pkix.hrl").
 
 start() ->
     EIDirS = code:lib_dir("erl_interface") ++ "\n",
@@ -3220,11 +3219,13 @@ start() ->
     file:write_file("conftest.out", list_to_binary(EIDirS ++ EILibS ++ ssldef() ++ RootDirS)),
     halt().
 
--ifdef('id-pkix').
-ssldef() -> "-DSSL39\n".
--else.
-ssldef() -> "\n".
--endif.
+ssldef() ->
+   OTP = (catch erlang:system_info(otp_release)),
+   if
+	OTP >= "R14" -> "-DSSL40\n";
+	OTP >= "R12" -> "-DSSL39\n";
+        true -> ""
+   end.
 
 %% return physical architecture based on OS/Processor
 archname() ->
@@ -3274,7 +3275,7 @@ _EOF
    # Second line
    ERLANG_EI_LIB=`cat conftest.out | head -n 2 | tail -n 1`
    # Third line
-   ERLANG_SSL39=`cat conftest.out | head -n 3 | tail -n 1`
+   ERLANG_SSLVER=`cat conftest.out | head -n 3 | tail -n 1`
    # End line
    ERLANG_DIR=`cat conftest.out | tail -n 1`