diff --git a/devel/ocaml-opam/Makefile b/devel/ocaml-opam/Makefile
index c304d6169d1e..6ee5fe018b62 100644
--- a/devel/ocaml-opam/Makefile
+++ b/devel/ocaml-opam/Makefile
@@ -1,60 +1,58 @@
 PORTNAME=	opam
-DISTVERSION=	2.1.5
-PORTREVISION=	3
+DISTVERSION=	2.1.6
 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
+		gmake:devel/gmake
 
 USES=		gmake
 ARCH!=		uname -p
 .if ${ARCH} == armv6 || ${ARCH} == armv7
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
 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_i386=	-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/distinfo b/devel/ocaml-opam/distinfo
index b31e09268ad9..4b15d663b0ad 100644
--- a/devel/ocaml-opam/distinfo
+++ b/devel/ocaml-opam/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685599850
-SHA256 (opam-full-2.1.5.tar.gz) = 09f8d9e410b2f5723c2bfedbf7970e3b305f5017895fcd91759f05e753ddcea5
-SIZE (opam-full-2.1.5.tar.gz) = 10801367
+TIMESTAMP = 1715883550
+SHA256 (opam-full-2.1.6.tar.gz) = d2af5edc85f552e0cf5ec0ddcc949d94f2dc550dc5df595174a06a4eaf8af628
+SIZE (opam-full-2.1.6.tar.gz) = 11704198
diff --git a/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch
index d80febb53acc..23e6f41d0a99 100644
--- a/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch
+++ b/devel/ocaml-opam/files/patch-src__ext_ocaml-patches_0001-Fix-relocation-ocaml-32-bit.patch
@@ -1,46 +1,35 @@
 --- src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch.orig	2023-05-27 13:17:37 UTC
 +++ src_ext/ocaml-patches/0001-Fix-relocation-ocaml-32-bit.patch
-@@ -0,0 +1,43 @@
+@@ -0,0 +1,32 @@
 +--- a/configure.orig	2023-05-27 13:13:22 UTC
 ++++ a/configure
-+@@ -14070,6 +14070,10 @@
-+        case $CC,$host in #(
-+   gcc*,powerpc-*-linux*) :
-+     mksharedlib="$CC -shared -mbss-plt \$(LDFLAGS)" ;; #(
-++  *,i[3456]86-*) :
-++    # Disable DT_TEXTREL warnings on Linux and BSD i386
-++    # See https://github.com/ocaml/ocaml/issues/9800
-++    mksharedlib="$CC -shared \$(LDFLAGS) -Wl,-z,notext" ;; #(
-+   *) :
-+     mksharedlib="$CC -shared \$(LDFLAGS)" ;;
-+ esac
-+@@ -14256,12 +14260,20 @@ case $host in #(
++@@ -14256,12 +14256,20 @@ case $host in #(
 +     arch=amd64; system=win64 ;; #(
 +   powerpc64le*-*-linux*) :
 +     arch=power; model=ppc64le; system=elf ;; #(
 ++  powerpc64le*-*-freebsd*) :
 ++    arch=power; model=ppc64le; system=bsd_elf ;; #(
 +   powerpc*-*-linux*) :
 +     arch=power; if $arch64; then :
 +   model=ppc64
 + else
 +   model=ppc
 + fi; system=elf ;; #(
 ++  powerpc*-*-freebsd*) :
 ++    arch=power; if $arch64; then :
 ++  model=ppc64
 ++else
 ++  model=ppc
 ++fi; system=bsd_elf ;; #(
 +   s390x*-*-linux*) :
 +     arch=s390x; model=z10; system=elf ;; #(
 +   # expected to match "gnueabihf" as well as "musleabihf"
-+@@ -14281,6 +14285,8 @@
++@@ -14281,6 +14289,8 @@
 +     arch=arm; model=armv6; system=linux_eabi ;; #(
 +   armv6*-*-freebsd*) :
 +     arch=arm; model=armv6; system=freebsd ;; #(
 ++  armv7*-*-freebsd*) :
 ++    arch=arm; model=armv7; system=freebsd ;; #(
 +   earmv6*-*-netbsd*) :
 +     arch=arm; model=armv6; system=netbsd ;; #(
 +   earmv7*-*-netbsd*) :