diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile
index 7daabb4303d5..27136e98875e 100644
--- a/devel/ocaml-pcre/Makefile
+++ b/devel/ocaml-pcre/Makefile
@@ -2,17 +2,21 @@
 # $FreeBSD$
 
 PORTNAME=	pcre
-PORTVERSION=	7.0.4
+PORTVERSION=	7.1.5
 CATEGORIES=	devel
-MASTER_SITES=	http://cdn.bitbucket.org/mmottl/pcre-ocaml/downloads/
 PKGNAMEPREFIX=	ocaml-
-DISTNAME=	${PORTNAME}-${PKGNAMEPREFIX}${PORTVERSION}
 
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Perl compatible regular expressions for Objective Caml
 
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	mmottl
+GH_PROJECT=	${PORTNAME}-ocaml
+GH_TAGNAME=	v${PORTVERSION}
+GH_COMMIT=	0e0196d
+
 USE_OCAML=	yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAML_LDCONFIG=	yes
@@ -24,6 +28,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$$prefix"/"share|${STAGEDIR}${PREFIX}/share|' \
+	-e '/datarootdir/s|$$pkg_name|&-ocaml|' \
 		${WRKSRC}/setup.ml
 
 post-install:
diff --git a/devel/ocaml-pcre/distinfo b/devel/ocaml-pcre/distinfo
index a208af7e46d9..aeaa7d242fce 100644
--- a/devel/ocaml-pcre/distinfo
+++ b/devel/ocaml-pcre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pcre-ocaml-7.0.4.tar.gz) = fc56b0e0f7ab5d159af77d1a51f67d0dd0b86ef30eccc0e9cbef4f79d4a75840
-SIZE (pcre-ocaml-7.0.4.tar.gz) = 84956
+SHA256 (pcre-7.1.5.tar.gz) = 605ec5899089471897b832018dfce889cf46817874e5b4df877ae91cc3a61060
+SIZE (pcre-7.1.5.tar.gz) = 88091
diff --git a/devel/ocaml-pcre/pkg-plist b/devel/ocaml-pcre/pkg-plist
index 870c974626bd..92cb3897957e 100644
--- a/devel/ocaml-pcre/pkg-plist
+++ b/devel/ocaml-pcre/pkg-plist
@@ -2,12 +2,16 @@
 %%OCAML_SITELIBDIR%%/pcre/dllpcre_stubs.so
 %%OCAML_SITELIBDIR%%/pcre/libpcre_stubs.a
 %%OCAML_SITELIBDIR%%/pcre/pcre.a
+%%OCAML_SITELIBDIR%%/pcre/pcre.annot
 %%OCAML_SITELIBDIR%%/pcre/pcre.cma
 %%OCAML_SITELIBDIR%%/pcre/pcre.cmi
+%%OCAML_SITELIBDIR%%/pcre/pcre.cmt
+%%OCAML_SITELIBDIR%%/pcre/pcre.cmti
 %%OCAML_SITELIBDIR%%/pcre/pcre.cmx
 %%OCAML_SITELIBDIR%%/pcre/pcre.cmxa
 %%OCAML_SITELIBDIR%%/pcre/pcre.cmxs
 %%OCAML_SITELIBDIR%%/pcre/pcre.mli
+%%OCAML_SITELIBDIR%%/pcre/pcre_compat.cmx
 %%PORTDOCS%%%%DOCSDIR%%/api/Pcre.html
 %%PORTDOCS%%%%DOCSDIR%%/api/index.html
 %%PORTDOCS%%%%DOCSDIR%%/api/index_attributes.html