diff --git a/devel/ocaml-bos/Makefile b/devel/ocaml-bos/Makefile
index 225e16631be5..4be94272b43c 100644
--- a/devel/ocaml-bos/Makefile
+++ b/devel/ocaml-bos/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	bos
-PORTVERSION=	0.2.1
+PORTVERSION=	0.3.0
 PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://erratique.ch/software/bos/releases/
 PKGNAMEPREFIX=	ocaml-
 
 MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	Basic OS interaction library for Objective Caml
 WWW=		https://erratique.ch/software/bos
 
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	${SA_DIR}/astring/META:devel/ocaml-astring \
 		${SA_DIR}/fmt/META:devel/ocaml-fmt \
 		${SA_DIR}/fpath/META:devel/ocaml-fpath \
 		${SA_DIR}/logs/META:devel/ocaml-logs \
 		${SA_DIR}/mtime/META:devel/ocaml-mtime \
 		${SA_DIR}/rresult/META:devel/ocaml-rresult \
 		${SA_DIR}/topkg/META:devel/ocaml-topkg \
 		ocamlbuild:devel/ocaml-ocamlbuild \
 		opam-installer:devel/ocaml-opam
 RUN_DEPENDS=	${SA_DIR}/astring/META:devel/ocaml-astring \
 		${SA_DIR}/fmt/META:devel/ocaml-fmt \
 		${SA_DIR}/fpath/META:devel/ocaml-fpath \
 		${SA_DIR}/logs/META:devel/ocaml-logs \
 		${SA_DIR}/mtime/META:devel/ocaml-mtime \
 		${SA_DIR}/rresult/META:devel/ocaml-rresult
 
 USES=		ocaml tar:tbz
 
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 PORTDOCS=	CHANGES.md LICENSE.md README.md
 
 OPTIONS_DEFINE=		DOCS
 
 SA_DIR=		${LOCALBASE}/${OCAML_SITELIBDIR}
 
 do-build:
 	@(cd ${BUILD_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
 		ocaml pkg/pkg.ml build \
 		--jobs ${MAKE_JOBS_NUMBER})
 
 do-install:
 	@(cd ${INSTALL_WRKSRC} && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} \
 		opam-installer -i \
 		--prefix=${STAGEDIR}${PREFIX} \
 		--docdir=${OCAML_DOCSDIR:S,^${PREFIX}/,,} \
 		--libdir=${OCAML_SITELIBDIR} ${PORTNAME}.install)
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/bos.cmxs
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/bos_setup.cmxs
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/bos_top.cmxs
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/setup/bos_setup.cmxs
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/${PORTNAME}/top/bos_top.cmxs
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-bos/distinfo b/devel/ocaml-bos/distinfo
index e5be60e273e5..1afc834ece27 100644
--- a/devel/ocaml-bos/distinfo
+++ b/devel/ocaml-bos/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1706842146
-SHA256 (bos-0.2.1.tbz) = d8d62e786b10d697e0457205a8eedeaa27ebcc90f1855f18df190cac2e3d8f37
-SIZE (bos-0.2.1.tbz) = 42330
+TIMESTAMP = 1779001432
+SHA256 (bos-0.3.0.tbz) = 089f369ed00967e92d89cc5fcd848c56bdab5c02737da4d483550bf56b5a79bc
+SIZE (bos-0.3.0.tbz) = 44755
diff --git a/devel/ocaml-bos/pkg-plist b/devel/ocaml-bos/pkg-plist
index 1248f26b2ef9..81dcefd198fd 100644
--- a/devel/ocaml-bos/pkg-plist
+++ b/devel/ocaml-bos/pkg-plist
@@ -1,36 +1,37 @@
 %%OCAML_SITELIBDIR%%/bos/opam
 %%OCAML_SITELIBDIR%%/bos/META
 %%OCAML_SITELIBDIR%%/bos/bos.a
 %%OCAML_SITELIBDIR%%/bos/bos.cma
 %%OCAML_SITELIBDIR%%/bos/bos.cmi
 %%OCAML_SITELIBDIR%%/bos/bos.cmti
 %%OCAML_SITELIBDIR%%/bos/bos.cmx
 %%OCAML_SITELIBDIR%%/bos/bos.cmxa
 %%OCAML_SITELIBDIR%%/bos/bos.cmxs
 %%OCAML_SITELIBDIR%%/bos/bos.mli
 %%OCAML_SITELIBDIR%%/bos/bos_base.cmx
 %%OCAML_SITELIBDIR%%/bos/bos_cmd.cmx
 %%OCAML_SITELIBDIR%%/bos/bos_log.cmx
 %%OCAML_SITELIBDIR%%/bos/bos_os_arg.cmx
 %%OCAML_SITELIBDIR%%/bos/bos_os_cmd.cmx
 %%OCAML_SITELIBDIR%%/bos/bos_os_dir.cmx
 %%OCAML_SITELIBDIR%%/bos/bos_os_env.cmx
 %%OCAML_SITELIBDIR%%/bos/bos_os_file.cmx
 %%OCAML_SITELIBDIR%%/bos/bos_os_path.cmx
 %%OCAML_SITELIBDIR%%/bos/bos_os_tmp.cmx
 %%OCAML_SITELIBDIR%%/bos/bos_os_u.cmx
 %%OCAML_SITELIBDIR%%/bos/bos_pat.cmx
-%%OCAML_SITELIBDIR%%/bos/bos_setup.a
-%%OCAML_SITELIBDIR%%/bos/bos_setup.cma
-%%OCAML_SITELIBDIR%%/bos/bos_setup.cmi
-%%OCAML_SITELIBDIR%%/bos/bos_setup.cmti
-%%OCAML_SITELIBDIR%%/bos/bos_setup.cmx
-%%OCAML_SITELIBDIR%%/bos/bos_setup.cmxa
-%%OCAML_SITELIBDIR%%/bos/bos_setup.cmxs
-%%OCAML_SITELIBDIR%%/bos/bos_setup.mli
-%%OCAML_SITELIBDIR%%/bos/bos_top.a
-%%OCAML_SITELIBDIR%%/bos/bos_top.cma
-%%OCAML_SITELIBDIR%%/bos/bos_top.cmx
-%%OCAML_SITELIBDIR%%/bos/bos_top.cmxa
-%%OCAML_SITELIBDIR%%/bos/bos_top.cmxs
 %%OCAML_SITELIBDIR%%/bos/bos_top_init.ml
+%%OCAML_SITELIBDIR%%/bos/setup/bos_setup.a
+%%OCAML_SITELIBDIR%%/bos/setup/bos_setup.cma
+%%OCAML_SITELIBDIR%%/bos/setup/bos_setup.cmi
+%%OCAML_SITELIBDIR%%/bos/setup/bos_setup.cmti
+%%OCAML_SITELIBDIR%%/bos/setup/bos_setup.cmx
+%%OCAML_SITELIBDIR%%/bos/setup/bos_setup.cmxa
+%%OCAML_SITELIBDIR%%/bos/setup/bos_setup.cmxs
+%%OCAML_SITELIBDIR%%/bos/setup/bos_setup.mli
+%%OCAML_SITELIBDIR%%/bos/top/bos_top_init_ml
+%%OCAML_SITELIBDIR%%/bos/top/bos_top.a
+%%OCAML_SITELIBDIR%%/bos/top/bos_top.cma
+%%OCAML_SITELIBDIR%%/bos/top/bos_top.cmx
+%%OCAML_SITELIBDIR%%/bos/top/bos_top.cmxa
+%%OCAML_SITELIBDIR%%/bos/top/bos_top.cmxs