diff --git a/misc/ocaml-opam/Makefile b/misc/ocaml-opam/Makefile
index e5388af3e51e..1c6fadf646d6 100644
--- a/misc/ocaml-opam/Makefile
+++ b/misc/ocaml-opam/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.48 2023/11/08 13:20:12 wiz Exp $
+# $NetBSD: Makefile,v 1.49 2024/01/26 18:54:14 abs Exp $
 
-VERSION=	2.0.8
+VERSION=	2.1.3
 GITHUB_PROJECT=	opam
 DISTNAME=	${GITHUB_PROJECT}-${VERSION}
 PKGNAME=	ocaml-${DISTNAME}
-PKGREVISION=	9
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
 
@@ -14,6 +13,8 @@ COMMENT=	OCaml package manager
 LICENSE=	gnu-lgpl-v3
 MAKE_JOBS_SAFE=	no
 
+USE_LANGUAGES+=	c++
+
 HAS_CONFIGURE=	yes
 OCAML_USE_DUNE=	yes
 
@@ -29,5 +30,6 @@ OPAM_INSTALL_FILES=	opam opam-installer opam-solver
 .include "../../misc/ocaml-opam-file-format/buildlink3.mk"
 .include "../../textproc/ocaml-jsonm/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
+
 .include "../../lang/ocaml/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ocaml-opam/PLIST b/misc/ocaml-opam/PLIST
index 5a6a19ad227e..efeccef61834 100644
--- a/misc/ocaml-opam/PLIST
+++ b/misc/ocaml-opam/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2021/03/04 09:27:35 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.9 2024/01/26 18:54:14 abs Exp $
 bin/opam
 bin/opam-installer
 ${OCAML_SITELIB}/opam-installer/META
@@ -10,47 +10,59 @@ ${OCAML_SITELIB}/opam-solver/opam
 ${OCAML_SITELIB}/opam-solver/opamActionGraph.cmi
 ${OCAML_SITELIB}/opam-solver/opamActionGraph.cmt
 ${OCAML_SITELIB}/opam-solver/opamActionGraph.cmti
-${OCAML_SITELIB}/opam-solver/opamActionGraph.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamActionGraph.cmx
 ${OCAML_SITELIB}/opam-solver/opamActionGraph.ml
 ${OCAML_SITELIB}/opam-solver/opamActionGraph.mli
+${OCAML_SITELIB}/opam-solver/opamBuiltin0install.cmi
+${OCAML_SITELIB}/opam-solver/opamBuiltin0install.cmt
+${OCAML_SITELIB}/opam-solver/opamBuiltin0install.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamBuiltin0install.cmx
+${OCAML_SITELIB}/opam-solver/opamBuiltin0install.ml
+${OCAML_SITELIB}/opam-solver/opamBuiltin0install.mli
 ${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmi
 ${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmt
 ${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmti
-${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.cmx
 ${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.ml
 ${OCAML_SITELIB}/opam-solver/opamBuiltinMccs.mli
+${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.cmi
+${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.cmt
+${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.cmx
+${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.ml
+${OCAML_SITELIB}/opam-solver/opamBuiltinZ3.mli
 ${OCAML_SITELIB}/opam-solver/opamCudf.cmi
 ${OCAML_SITELIB}/opam-solver/opamCudf.cmt
 ${OCAML_SITELIB}/opam-solver/opamCudf.cmti
-${OCAML_SITELIB}/opam-solver/opamCudf.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamCudf.cmx
 ${OCAML_SITELIB}/opam-solver/opamCudf.ml
 ${OCAML_SITELIB}/opam-solver/opamCudf.mli
 ${OCAML_SITELIB}/opam-solver/opamCudfSolver.cmi
 ${OCAML_SITELIB}/opam-solver/opamCudfSolver.cmt
 ${OCAML_SITELIB}/opam-solver/opamCudfSolver.cmti
-${OCAML_SITELIB}/opam-solver/opamCudfSolver.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamCudfSolver.cmx
 ${OCAML_SITELIB}/opam-solver/opamCudfSolver.ml
 ${OCAML_SITELIB}/opam-solver/opamCudfSolver.mli
 ${OCAML_SITELIB}/opam-solver/opamCudfSolverSig.cmi
 ${OCAML_SITELIB}/opam-solver/opamCudfSolverSig.cmt
-${OCAML_SITELIB}/opam-solver/opamCudfSolverSig.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamCudfSolverSig.cmx
 ${OCAML_SITELIB}/opam-solver/opamCudfSolverSig.ml
 ${OCAML_SITELIB}/opam-solver/opamSolver.cmi
 ${OCAML_SITELIB}/opam-solver/opamSolver.cmt
 ${OCAML_SITELIB}/opam-solver/opamSolver.cmti
-${OCAML_SITELIB}/opam-solver/opamSolver.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamSolver.cmx
 ${OCAML_SITELIB}/opam-solver/opamSolver.ml
 ${OCAML_SITELIB}/opam-solver/opamSolver.mli
 ${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmi
 ${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmt
 ${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmti
-${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opamSolverConfig.cmx
 ${OCAML_SITELIB}/opam-solver/opamSolverConfig.ml
 ${OCAML_SITELIB}/opam-solver/opamSolverConfig.mli
-${OCAML_SITELIB}/opam-solver/opam_solver.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opam_solver.a
 ${OCAML_SITELIB}/opam-solver/opam_solver.cma
-${OCAML_SITELIB}/opam-solver/opam_solver.cmxa
-${OCAML_SITELIB}/opam-solver/opam_solver.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opam_solver.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/opam-solver/opam_solver.cmxs
 ${OCAML_SITELIB}/opam/META
 ${OCAML_SITELIB}/opam/dune-package
 ${OCAML_SITELIB}/opam/opam
@@ -77,6 +89,8 @@ man/man1/opam-install.1
 man/man1/opam-installer.1
 man/man1/opam-lint.1
 man/man1/opam-list.1
+man/man1/opam-lock.1
+man/man1/opam-option.1
 man/man1/opam-pin.1
 man/man1/opam-reinstall.1
 man/man1/opam-remote.1
diff --git a/misc/ocaml-opam/distinfo b/misc/ocaml-opam/distinfo
index 7fe0b7d47e14..8fc6d1c3ca61 100644
--- a/misc/ocaml-opam/distinfo
+++ b/misc/ocaml-opam/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:59:17 nia Exp $
+$NetBSD: distinfo,v 1.15 2024/01/26 18:54:14 abs Exp $
 
-BLAKE2s (opam-2.0.8.tar.gz) = 8a8f39306c0fdadc928a6e8bb7faf7d170b4bddd35b423e05c2a640bad58177a
-SHA512 (opam-2.0.8.tar.gz) = 14737dc994be2c54dfeaf2658d3713178033e1bc2b4b845a58b4bfc118bbbf12b502924add0ae32b4b2b6c1944462e5ee7143df3de362d9ee39573249d013bc9
-Size (opam-2.0.8.tar.gz) = 643221 bytes
+BLAKE2s (opam-2.1.3.tar.gz) = 91ea09c12ae2f56fc6a3f31f44b12e6c56d11dbec92b14f274a187f172bc4dec
+SHA512 (opam-2.1.3.tar.gz) = 040e4f58f93e962ff422617ce0d35ed45dd86921a9aac3505914c33dd942d0e5e5771e7e1774046504f9aa84f32bc4fbd6ac7720fbea862d48bf1ca29e02cefc
+Size (opam-2.1.3.tar.gz) = 832450 bytes