diff --git a/devel/ocaml-cppo/Makefile b/devel/ocaml-cppo/Makefile
index c0646f11e511..20a6267b3442 100644
--- a/devel/ocaml-cppo/Makefile
+++ b/devel/ocaml-cppo/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	cppo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.9
 PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	ocaml-
 
-MAINTAINER=	eduardo@FreeBSD.org
+MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	C-style preprocessor for OCaml
 WWW=		https://github.com/ocaml-community/cppo
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	dune:devel/ocaml-dune \
 		ocamlbuild:devel/ocaml-ocamlbuild
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ocaml-community
 USE_OCAML=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/cppo
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ocaml/cppo_ocamlbuild/cppo_ocamlbuild.cmxs
 
 .include <bsd.port.mk>
diff --git a/devel/ocaml-extlib/Makefile b/devel/ocaml-extlib/Makefile
index 2dc6c7cf7468..33480bfb0f01 100644
--- a/devel/ocaml-extlib/Makefile
+++ b/devel/ocaml-extlib/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	extlib
 DISTVERSION=	1.7.9
 PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/ygrek/ocaml-extlib/releases/download/${DISTVERSION}/
 PKGNAMEPREFIX=	ocaml-
 
-MAINTAINER=	eduardo@FreeBSD.org
+MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	Complete - yet small - standard library for OCaml
 WWW=		https://github.com/ygrek/ocaml-extlib
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BROKEN_mips=	depends on Ocaml(not available for mips)
 
 BUILD_DEPENDS=	cppo:devel/ocaml-cppo
 
 USES=		gmake
 
 USE_OCAML=	yes
 USE_OCAML_CAMLP4=	yes
 USE_OCAML_FINDLIB=	yes
 USE_OCAMLFIND_PLIST=	yes
 
 MAKE_ARGS=	VERSION="${DISTVERSION}"
 ALL_TARGET=	all opt doc
 
 DOCSDIR=	${OCAML_DOCSDIR}/${PORTNAME}
 
 WRKSRC_SUBDIR=	src
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/devel/omake/Makefile b/devel/omake/Makefile
index 0e27bdf453b8..5f314dcdc98f 100644
--- a/devel/omake/Makefile
+++ b/devel/omake/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	omake
 DISTVERSION=	0.10.6
 PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://download.camlcity.org/download/
 
-MAINTAINER=	eduardo@FreeBSD.org
+MAINTAINER=	freebsd@dev.thsi.be
 COMMENT=	Flexible build system
 WWW=		http://projects.camlcity.org/projects/omake.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		ncurses readline
 USE_OCAML=	yes
 
 NO_OCAML_RUNDEPENDS=	yes
 HAS_CONFIGURE=	yes
 MAKE_ENV=	INSTALL_ROOT=${STAGEDIR}
 
 INFO=		omake-doc
 
 OPTIONS_DEFINE=	DOCS
 
 bench: build
 	@cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_ARGS} boot/omake bench
 
 post-install:
 	@(cd ${WRKSRC}/doc/info && ${INSTALL_DATA} omake-doc.info \
 		${STAGEDIR}${PREFIX}/${INFO_PATH})
 	@(cd ${WRKSRC}/doc/info && ${INSTALL_DATA} omake-doc.info-* \
 		${STAGEDIR}${PREFIX}/${INFO_PATH})
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/omake
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@(cd ${WRKSRC}/doc/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 do-test:
 	@cd ${WRKSRC}; ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${MAKE_ARGS} boot/omake check
 	@${FIND} -ds ${WRKSRC}/test -type f -name 'result.log' -print0 | \
 		${XARGS} -0tI @ ${CAT} @
 
 .include <bsd.port.mk>