diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
index 220f0e40ca5f..c304d6169d1e 100644
--- a/devel/ocaml-opam/Makefile
+++ b/devel/ocaml-opam/Makefile
@@ -1,59 +1,60 @@
 PORTNAME=	opam
 DISTVERSION=	2.1.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/ocaml/opam/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	ocaml-
 DISTNAME=	opam-full-${DISTVERSION}
 
 MAINTAINER=	hannes@mehnert.org
 COMMENT=	Source-based package manager for OCaml
 WWW=		https://opam.ocaml.org/
 
 LICENSE=	LGPL21
 
 RUN_DEPENDS=	curl:ftp/curl \
 		gpatch:devel/patch \
 		gmake:devel/gmake \
 		${RUN_DEPENDS_${ARCH}}
 RUN_DEPENDS_armv6=	${LOCALBASE}/bin/as:devel/binutils
 RUN_DEPENDS_armv7=	${LOCALBASE}/bin/as:devel/binutils
 
 USES=		gmake
 ARCH!=		uname -p
 .if ${ARCH} == armv6 || ${ARCH} == armv7
 USE_BINUTILS=	yes
 .endif
 
 GNU_CONFIGURE=	yes
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--disable-checks
 
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	cold-lib-ext cold-all
 
 LDFLAGS_armv6=	-Wl,-z,notext
 LDFLAGS_armv7=	-Wl,-z,notext
 LDFLAGS_powerpc=	-Wl,-z,notext
 LDFLAGS+=	${LDFLAGS_${ARCH}}
 
 NOPRECIOUSMAKEVARS=	yes
 
 OPTIONS_DEFINE=		DARCS GIT MERCURIAL RSYNC
 OPTIONS_DEFAULT=	GIT RSYNC
 NO_OPTIONS_SORT=	yes
 
 RSYNC_DESC=		Remote repository synchronized with Rsync
 
 DARCS_RUN_DEPENDS=	darcs:devel/hs-darcs
 GIT_RUN_DEPENDS=	git:devel/git
 MERCURIAL_RUN_DEPENDS=	${PY_MERCURIAL}
 RSYNC_RUN_DEPENDS=	rsync:net/rsync
 
 pre-configure:
 	@(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} compiler)
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam-installer
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/opam
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-opam/pkg-plist b/devel/ocaml-opam/pkg-plist
index 5be9bb628de8..dca86ff640d3 100644
--- a/devel/ocaml-opam/pkg-plist
+++ b/devel/ocaml-opam/pkg-plist
@@ -1,42 +1,42 @@
 bin/opam
 bin/opam-installer
-man/man1/opam-admin-add-constraint.1.gz
-man/man1/opam-admin-add-hashes.1.gz
-man/man1/opam-admin-cache.1.gz
-man/man1/opam-admin-check.1.gz
-man/man1/opam-admin-filter.1.gz
-man/man1/opam-admin-help.1.gz
-man/man1/opam-admin-index.1.gz
-man/man1/opam-admin-lint.1.gz
-man/man1/opam-admin-list.1.gz
-man/man1/opam-admin-make.1.gz
-man/man1/opam-admin-upgrade.1.gz
-man/man1/opam-admin.1.gz
-man/man1/opam-clean.1.gz
-man/man1/opam-config.1.gz
-man/man1/opam-env.1.gz
-man/man1/opam-exec.1.gz
-man/man1/opam-help.1.gz
-man/man1/opam-info.1.gz
-man/man1/opam-init.1.gz
-man/man1/opam-install.1.gz
-man/man1/opam-installer.1.gz
-man/man1/opam-list.1.gz
-man/man1/opam-lint.1.gz
-man/man1/opam-lock.1.gz
-man/man1/opam-option.1.gz
-man/man1/opam-pin.1.gz
-man/man1/opam-reinstall.1.gz
-man/man1/opam-remove.1.gz
-man/man1/opam-remote.1.gz
-man/man1/opam-repository.1.gz
-man/man1/opam-search.1.gz
-man/man1/opam-source.1.gz
-man/man1/opam-show.1.gz
-man/man1/opam-switch.1.gz
-man/man1/opam-update.1.gz
-man/man1/opam-upgrade.1.gz
-man/man1/opam-uninstall.1.gz
-man/man1/opam-unpin.1.gz
-man/man1/opam-var.1.gz
-man/man1/opam.1.gz
+share/man/man1/opam-admin-add-constraint.1.gz
+share/man/man1/opam-admin-add-hashes.1.gz
+share/man/man1/opam-admin-cache.1.gz
+share/man/man1/opam-admin-check.1.gz
+share/man/man1/opam-admin-filter.1.gz
+share/man/man1/opam-admin-help.1.gz
+share/man/man1/opam-admin-index.1.gz
+share/man/man1/opam-admin-lint.1.gz
+share/man/man1/opam-admin-list.1.gz
+share/man/man1/opam-admin-make.1.gz
+share/man/man1/opam-admin-upgrade.1.gz
+share/man/man1/opam-admin.1.gz
+share/man/man1/opam-clean.1.gz
+share/man/man1/opam-config.1.gz
+share/man/man1/opam-env.1.gz
+share/man/man1/opam-exec.1.gz
+share/man/man1/opam-help.1.gz
+share/man/man1/opam-info.1.gz
+share/man/man1/opam-init.1.gz
+share/man/man1/opam-install.1.gz
+share/man/man1/opam-installer.1.gz
+share/man/man1/opam-list.1.gz
+share/man/man1/opam-lint.1.gz
+share/man/man1/opam-lock.1.gz
+share/man/man1/opam-option.1.gz
+share/man/man1/opam-pin.1.gz
+share/man/man1/opam-reinstall.1.gz
+share/man/man1/opam-remove.1.gz
+share/man/man1/opam-remote.1.gz
+share/man/man1/opam-repository.1.gz
+share/man/man1/opam-search.1.gz
+share/man/man1/opam-source.1.gz
+share/man/man1/opam-show.1.gz
+share/man/man1/opam-switch.1.gz
+share/man/man1/opam-update.1.gz
+share/man/man1/opam-upgrade.1.gz
+share/man/man1/opam-uninstall.1.gz
+share/man/man1/opam-unpin.1.gz
+share/man/man1/opam-var.1.gz
+share/man/man1/opam.1.gz