diff --git a/security/ocaml-ssl/Makefile b/security/ocaml-ssl/Makefile
index 71e3e0654f608..871f733862ce3 100644
--- a/security/ocaml-ssl/Makefile
+++ b/security/ocaml-ssl/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2015/08/07 11:20:33 jaapb Exp $
+# $NetBSD: Makefile,v 1.19 2016/02/03 12:48:38 jaapb Exp $
 #
 
 PKGNAME=	${DISTNAME} # to avoid prefixing with ocaml-
-DISTNAME=	ocaml-ssl-0.4.7
-PKGREVISION=	3
+DISTNAME=	ocaml-ssl-0.5.2
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=savonet/}
+MASTER_SITES=	${MASTER_SITE_GITHUB:=savonet/}
 
-MAINTAINER=	jaapb@kerguelen.org
-HOMEPAGE=	http://savonet.sourceforge.net/wiki/OCamlLibs
+MAINTAINER=	jaapb@NetBSD.org
+HOMEPAGE=	http://github.com/savonet/ocaml-ssl
 COMMENT=	SSL library for OCaml
 LICENSE=	gnu-lgpl-v2.1
 
@@ -16,9 +15,13 @@ LICENSE=	gnu-lgpl-v2.1
 MAKE_JOBS_SAFE=	no
 
 HAS_CONFIGURE=	yes
-USE_TOOLS+=	gmake
+USE_TOOLS+=	autoconf gmake
 
 OCAML_USE_FINDLIB=	yes
+OCAML_FINDLIB_REGISTER=	yes
+
+pre-configure:
+	cd ${WRKSRC} && autoconf
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/security/ocaml-ssl/PLIST b/security/ocaml-ssl/PLIST
index 6b49f792ad10a..80cb06537ea58 100644
--- a/security/ocaml-ssl/PLIST
+++ b/security/ocaml-ssl/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/10/09 21:06:57 jaapb Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/ssl
+@comment $NetBSD: PLIST,v 1.5 2016/02/03 12:48:38 jaapb Exp $
 ${OCAML_SITELIB}/ssl/META
 ${OCAML_SITELIB}/ssl/libssl_stubs.a
 ${OCAML_SITELIB}/ssl/libssl_threads_stubs.a
@@ -17,4 +16,3 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/ssl/ssl_threads.cmxa
 ${OCAML_SITELIB}/ssl/ssl_threads.mli
 ${OCAML_SITELIB}/ssl/dllssl_stubs.so
 ${OCAML_SITELIB}/ssl/dllssl_threads_stubs.so
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/ssl
diff --git a/security/ocaml-ssl/buildlink3.mk b/security/ocaml-ssl/buildlink3.mk
index 8909064ee5985..7c983a7213701 100644
--- a/security/ocaml-ssl/buildlink3.mk
+++ b/security/ocaml-ssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2015/08/07 11:20:33 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2016/02/03 12:48:38 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-ssl
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-ssl
 OCAML_SSL_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-ssl+=	ocaml-ssl>=0.4.0
-BUILDLINK_ABI_DEPENDS.ocaml-ssl+=	ocaml-ssl>=0.4.7nb3
+BUILDLINK_ABI_DEPENDS.ocaml-ssl+=	ocaml-ssl>=0.5.2
 BUILDLINK_PKGSRCDIR.ocaml-ssl?=	../../security/ocaml-ssl
 
 .include "../../lang/ocaml/buildlink3.mk"
diff --git a/security/ocaml-ssl/distinfo b/security/ocaml-ssl/distinfo
index 516e2b6948532..f65f4d37ea430 100644
--- a/security/ocaml-ssl/distinfo
+++ b/security/ocaml-ssl/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2015/11/04 01:17:52 agc Exp $
+$NetBSD: distinfo,v 1.9 2016/02/03 12:48:38 jaapb Exp $
 
-SHA1 (ocaml-ssl-0.4.7.tar.gz) = 3261b53f610e16b44da48828542afcfe4143c8ae
-RMD160 (ocaml-ssl-0.4.7.tar.gz) = 54ef57097a11e6d3ce307645265d2b44251b2c48
-SHA512 (ocaml-ssl-0.4.7.tar.gz) = 6f740e87ef4b560cba71af57855de72737bd34f9fd4f57c9a6674caf32a417957269c83fadc41adbd661287553fef9e97951d821945f940700e48e922a951d0e
-Size (ocaml-ssl-0.4.7.tar.gz) = 119209 bytes
+SHA1 (ocaml-ssl-0.5.2.tar.gz) = 49f430a59c9ec56324697ffd682d39790347824c
+RMD160 (ocaml-ssl-0.5.2.tar.gz) = 04c85e2b861db131e1530b25e0ca4ba26592c3ac
+SHA512 (ocaml-ssl-0.5.2.tar.gz) = 3e1d31d0da9824549de706bf0ecb16b710a02f32a0d9ce8ce735d8bd7911cd9ea97b8543b56b8efeb030b944bd893154e8d510d54d5b0c8bc6f5bbb3b1813bb8
+Size (ocaml-ssl-0.5.2.tar.gz) = 46973 bytes
 SHA1 (patch-src_Makefile) = fa5e74f567aff37d8e25fd93ef2db7fdd5b0b17a