diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
index d7e060451647..e8274f7019dd 100644
--- a/devel/ocaml-opam/Makefile
+++ b/devel/ocaml-opam/Makefile
@@ -1,49 +1,58 @@
 PORTNAME=	opam
 DISTVERSION=	2.1.5
-PORTREVISION=	1
+PORTREVISION=	2
 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
 
-BROKEN_armv6=	ld: error: can't create dynamic relocation R_ARM_ABS32 against symbol: caml_program in readonly segment
-BROKEN_armv7=	ld: error: can't create dynamic relocation R_ARM_ABS32 against symbol: caml_program in readonly segment
-
 RUN_DEPENDS=	curl:ftp/curl \
-		gpatch:devel/patch
+		gpatch:devel/patch \
+		${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
 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
 
-NOPRECIOUSMAKEVARS=	yes
-
 pre-configure:
-	cd ${WRKSRC} && ${MAKE_CMD} compiler
+	@(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>