diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index 8a881b145..b1b87c8df 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -50,9 +50,9 @@
 
 -include("ejabberd.hrl").
 -include("XmppAddr.hrl").
--include_lib("ssl/include/ssl_pkix.hrl").
--define(PKIXEXPLICIT, 'OTP-PKIX').
--define(PKIXIMPLICIT, 'OTP-PKIX').
+-include_lib("public_key/include/public_key.hrl"). 
+-define(PKIXEXPLICIT, 'OTP-PUB-KEY').
+-define(PKIXIMPLICIT, 'OTP-PUB-KEY').
 
 -define(DICT, dict).
 
diff --git a/src/tls/tls.erl b/src/tls/tls.erl
index 2b3359aef..7c6009078 100644
--- a/src/tls/tls.erl
+++ b/src/tls/tls.erl
@@ -61,6 +61,8 @@
 -define(GET_VERIFY_RESULT,    8).
 -define(VERIFY_NONE, 16#10000).
 
+
+
 -record(tlssock, {tcpsock, tlsport}).
 
 start() ->
@@ -232,7 +234,7 @@ close(#tlssock{tcpsock = TCPSocket, tlsport = Port}) ->
 get_peer_certificate(#tlssock{tlsport = Port}) ->
     case port_control(Port, ?GET_PEER_CERTIFICATE, []) of
 	<<0, BCert/binary>> ->
-	    case catch ssl_pkix:decode_cert(BCert, [pkix]) of
+	    case catch public_key:pkix_decode_cert(BCert, plain) of
 		{ok, Cert} ->
 		    {ok, Cert};
 		_ ->