diff --git a/security/ocaml-cryptokit/Makefile b/security/ocaml-cryptokit/Makefile
index ce1602b585d5..5f99c2576744 100644
--- a/security/ocaml-cryptokit/Makefile
+++ b/security/ocaml-cryptokit/Makefile
@@ -1,20 +1,24 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org>
 
 PORTNAME=	cryptokit
-PORTVERSION=	1.6
+PORTVERSION=	1.11
 CATEGORIES=	security
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/891/
 PKGNAMEPREFIX=	ocaml-
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Variety of cryptographic primitives for Objective Caml
 
-BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild
+BUILD_DEPENDS=	ocamlbuild:devel/ocaml-ocamlbuild \
+		${LOCALBASE}/${OCAML_SITELIBDIR}/zarith/META:math/ocaml-zarith
 
 DESTDIRNAME=	destdir
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--docdir ${OCAML_DOCSDIR}
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	xavierleroy
+GH_TAGNAME=	release${PORTVERSION:S/.//g}
+
 USE_OCAML=	yes
 USE_OCAML_LDCONFIG=	yes
 USE_OCAML_FINDLIB=	yes
@@ -27,9 +31,4 @@ OPTIONS_DEFINE=	DOCS
 
 DOCS_ALL_TARGET=	doc
 
-post-patch:
-	@${REINPLACE_CMD} 's,"install","install" :: "-ldconf ignore",' \
-		${WRKSRC}/setup.ml
-	@${REINPLACE_CMD} -e 's,uint32,&_t,' ${WRKSRC}/src/stubs-md5.c
-
 .include <bsd.port.mk>
diff --git a/security/ocaml-cryptokit/distinfo b/security/ocaml-cryptokit/distinfo
index f5813e446c8f..5ffde3aa0fa0 100644
--- a/security/ocaml-cryptokit/distinfo
+++ b/security/ocaml-cryptokit/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cryptokit-1.6.tar.gz) = c58cb6ee1efa996bb227d64b378e80824637f875e914ad38833d610b7f992422
-SIZE (cryptokit-1.6.tar.gz) = 133031
+TIMESTAMP = 1468831896
+SHA256 (xavierleroy-cryptokit-1.11-release111_GH0.tar.gz) = 8fb4c7f315cd554c53897db412731dc2288ed0cfd6d5dda6f76796aced8d23fd
+SIZE (xavierleroy-cryptokit-1.11-release111_GH0.tar.gz) = 150687