diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile
index c96bad16f230..8de85e2b19c5 100644
--- a/devel/ocaml-findlib/Makefile
+++ b/devel/ocaml-findlib/Makefile
@@ -1,66 +1,67 @@
 PORTNAME=	findlib
 PORTVERSION=	1.9.6
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.camlcity.org/download/
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	OCaml package manager
 WWW=		http://projects.camlcity.org/projects/findlib.html
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		gmake
 USE_OCAML=	yes
 USE_OCAML_CAMLP4=yes
 USE_OCAML_FINDLIB=yes
 OCAMLFIND_DEPEND=	# Avoid dependency loop
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	-bindir "${PREFIX}/bin" -mandir "${PREFIX}/man" \
+CONFIGURE_ARGS=	-bindir "${PREFIX}/bin" -mandir "${PREFIX}/share/man" \
 		-sitelib "${PREFIX}/${OCAML_SITELIBDIR}" \
 		-config "${PREFIX}/etc/findlib.conf"
 MAKE_ENV=	OCAML_LIBDIR="${PREFIX}/${OCAML_LIBDIR}"
 ALL_TARGET=	all opt
 MAKE_JOBS_UNSAFE=	yes
 DOCSDIR=	${PREFIX}/share/doc/ocaml/${PORTNAME}
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	TOOLBOX DOCS
 OPTIONS_DEFAULT=TOOLBOX
 OPTIONS_SUB=	yes
 
 TOOLBOX_DESC=	Include toolbox interface (requires OCaml with Tk)
 TOOLBOX_CONFIGURE_ON=	-with-toolbox
 TOOLBOX_RUN_DEPENDS=	labltk:x11-toolkits/ocaml-labltk
 TOOLBOX_BUILD_DEPENDS=	${TOOLBOX_RUN_DEPENDS}
 
 .include <bsd.port.pre.mk>
 
 post-install:
 	cd ${STAGEDIR}${PREFIX} && \
 	    ${STRIP_CMD} bin/ocamlfind \
 	    ${OCAML_SITELIBDIR}/findlib/findlib.cmxs \
 	    ${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \
 	    ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs
 .if !exists(${LOCALBASE}/lib/ocaml/graphics.cmi)
 	@${REINPLACE_CMD} -e '/graphics\/META/d' ${TMPPLIST}
 .endif
 .if !exists(${LOCALBASE}/lib/ocaml/ocamlbuild/ocamlbuildlib.cma)
 	@${REINPLACE_CMD} -e '/ocamlbuild\/META/d' ${TMPPLIST}
 .endif
 # Spacetime profiling is only available for native code on 64-bit targets
 .if ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpcspe
 	@${REINPLACE_CMD} -e '/raw_spacetime/d' ${TMPPLIST}
 .endif
 
 post-install-TOOLBOX-on:
 	${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \
 	    ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \
 	    "! -regex .*ref-man.*"
 
 .include <bsd.port.post.mk>
diff --git a/devel/ocaml-findlib/pkg-plist b/devel/ocaml-findlib/pkg-plist
index b083eb701969..b30e436e3923 100644
--- a/devel/ocaml-findlib/pkg-plist
+++ b/devel/ocaml-findlib/pkg-plist
@@ -1,57 +1,57 @@
 bin/ocamlfind
 bin/safe_camlp4
 %%ETCDIR%%.conf
 %%OCAML_SITELIBDIR%%/bigarray/META
 %%OCAML_SITELIBDIR%%/bytes/META
 %%OCAML_SITELIBDIR%%/camlp4/META
 %%OCAML_SITELIBDIR%%/compiler-libs/META
 %%OCAML_SITELIBDIR%%/dynlink/META
 %%OCAML_SITELIBDIR%%/findlib/META
 %%OCAML_SITELIBDIR%%/findlib/Makefile.config
 %%OCAML_SITELIBDIR%%/findlib/Makefile.packages
 %%OCAML_SITELIBDIR%%/findlib/findlib.a
 %%OCAML_SITELIBDIR%%/findlib/findlib.cma
 %%OCAML_SITELIBDIR%%/findlib/findlib.cmi
 %%OCAML_SITELIBDIR%%/findlib/findlib.cmxa
 %%OCAML_SITELIBDIR%%/findlib/findlib.cmxs
 %%OCAML_SITELIBDIR%%/findlib/findlib.mli
 %%OCAML_SITELIBDIR%%/findlib/findlib_config.cmi
 %%OCAML_SITELIBDIR%%/findlib/findlib_config.ml
 %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.a
 %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cma
 %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cmxa
 %%OCAML_SITELIBDIR%%/findlib/findlib_dynload.cmxs
 %%OCAML_SITELIBDIR%%/findlib/findlib_top.a
 %%OCAML_SITELIBDIR%%/findlib/findlib_top.cma
 %%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxa
 %%OCAML_SITELIBDIR%%/findlib/findlib_top.cmxs
 %%OCAML_SITELIBDIR%%/findlib/fl_args.cmi
 %%OCAML_SITELIBDIR%%/findlib/fl_dynload.cmi
 %%OCAML_SITELIBDIR%%/findlib/fl_dynload.mli
 %%OCAML_SITELIBDIR%%/findlib/fl_lint.cmi
 %%OCAML_SITELIBDIR%%/findlib/fl_meta.cmi
 %%OCAML_SITELIBDIR%%/findlib/fl_metascanner.cmi
 %%OCAML_SITELIBDIR%%/findlib/fl_metascanner.mli
 %%OCAML_SITELIBDIR%%/findlib/fl_metatoken.cmi
 %%OCAML_SITELIBDIR%%/findlib/fl_package_base.cmi
 %%OCAML_SITELIBDIR%%/findlib/fl_package_base.mli
 %%OCAML_SITELIBDIR%%/findlib/fl_split.cmi
 %%OCAML_SITELIBDIR%%/findlib/fl_topo.cmi
 %%OCAML_SITELIBDIR%%/findlib/ocaml_args.cmi
 %%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard
 %%TOOLBOX%%%%OCAML_SITELIBDIR%%/findlib/make_wizard.pattern
 %%OCAML_SITELIBDIR%%/findlib/topfind.cmi
 %%OCAML_SITELIBDIR%%/findlib/topfind.mli
 %%OCAML_SITELIBDIR%%/graphics/META
 %%TOOLBOX%%%%OCAML_SITELIBDIR%%/labltk/META
 %%OCAML_SITELIBDIR%%/ocamlbuild/META
 %%OCAML_SITELIBDIR%%/ocamldoc/META
 %%OCAML_SITELIBDIR%%/stdlib/META
 %%OCAML_SITELIBDIR%%/str/META
 %%OCAML_SITELIBDIR%%/threads/META
 %%OCAML_SITELIBDIR%%/unix/META
 lib/ocaml/topfind
-man/man1/ocamlfind.1.gz
-man/man5/META.5.gz
-man/man5/findlib.conf.5.gz
-man/man5/site-lib.5.gz
+share/man/man1/ocamlfind.1.gz
+share/man/man5/META.5.gz
+share/man/man5/findlib.conf.5.gz
+share/man/man5/site-lib.5.gz