diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile
index df26204879db..dcc6bc1181ae 100644
--- a/devel/ocaml-pcre/Makefile
+++ b/devel/ocaml-pcre/Makefile
@@ -1,31 +1,53 @@
 # New ports collection makefile for:   ocaml-pcre
 # Date created:        21 April 2002
 # Whom:                Henrik Motakef <henrik.motakef@web.de>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	pcre
-PORTVERSION=	4.33.0
-PORTREVISION=	1
+PORTVERSION=	5.06.2
+PORTREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.henrik-motakef.de/freebsd-distfiles/
-MASTER_SITE_SUBDIR=	pcre-ocaml
+MASTER_SITES=	http://www.oefai.at/~markus/ocaml_sources/
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	pcre-ocaml-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl compatible regular expressions for Objective Caml
 
 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
 		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 USE_GMAKE=	yes
 MAKE_ENV=	OCAML_LIB_INSTALL="${PREFIX}/lib/ocaml/site-lib/pcre" \
 		INCDIRS="${LOCALBASE}/include" LIBDIRS="${LOCALBASE}/lib"
 .if !defined(WITH_CUSTOM)
 MAKE_ENV+=	NO_CUSTOM=y
 .endif
+ALL_TARGET=	all
+
+.if !defined(NOPORTDOCS)
+BUILD_DEPENDS+=	latex:${PORTSDIR}/print/teTeX
+ALL_TARGET+=	doc
+PORTDOCS=	*
+
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
+.endif
+
+post-install:
+	@${ECHO_CMD} "@unexec ocamlfind remove pcre 2>/dev/null || true" >> ${TMPPLIST}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
+	@${FIND} ${EXAMPLESDIR} -type f | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-pcre/distinfo b/devel/ocaml-pcre/distinfo
index 336c7238e456..47754dc08798 100644
--- a/devel/ocaml-pcre/distinfo
+++ b/devel/ocaml-pcre/distinfo
@@ -1,2 +1,2 @@
-MD5 (pcre-ocaml-4.33.0.tar.gz) = 0c8b9b5c3d1d7f04622ae781b4bb554d
-SIZE (pcre-ocaml-4.33.0.tar.gz) = 43306
+MD5 (pcre-ocaml-5.06.2.tar.gz) = 632f5a594c6349380d39840a20e94c8c
+SIZE (pcre-ocaml-5.06.2.tar.gz) = 50466
diff --git a/devel/ocaml-pcre/pkg-plist b/devel/ocaml-pcre/pkg-plist
deleted file mode 100644
index 72864d9724d7..000000000000
--- a/devel/ocaml-pcre/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-lib/ocaml/site-lib/pcre/META
-lib/ocaml/site-lib/pcre/dllpcre_stubs.so
-lib/ocaml/site-lib/pcre/libpcre_stubs.a
-lib/ocaml/site-lib/pcre/pcre.a
-lib/ocaml/site-lib/pcre/pcre.cmxa
-lib/ocaml/site-lib/pcre/pcre.cma
-lib/ocaml/site-lib/pcre/pcre.cmi
-lib/ocaml/site-lib/pcre/pcre.mli
-@dirrm lib/ocaml/site-lib/pcre
-@exec echo "Updating %D/lib/ocaml/ld.conf"; if (! grep -q "lib/ocaml/site-lib/pcre" %D/lib/ocaml/ld.conf); then echo "%D/lib/ocaml/site-lib/pcre" >> %D/lib/ocaml/ld.conf; fi;
-@unexec echo "Updating %D/lib/ocaml/ld.conf"; cp %D/lib/ocaml/ld.conf %D/lib/ocaml/ld.conf.tmp; grep -v "lib/ocaml/site-lib/pcre" %D/lib/ocaml/ld.conf.tmp > %D/lib/ocaml/ld.conf; rm %D/lib/ocaml/ld.conf.tmp