diff --git a/devel/ice/Makefile b/devel/ice/Makefile
index 096e6024fc3d..9c2624b591ae 100644
--- a/devel/ice/Makefile
+++ b/devel/ice/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=		3.6.4
 DISTVERSIONPREFIX=	v
 CATEGORIES=		devel
 
-MAINTAINER=		freebsd@grem.de
+MAINTAINER=		grembo@FreeBSD.org
 COMMENT=		Modern alternative to object middleware such as CORBA/COM/DCOM/COM+
 
 LICENSE=		GPLv2
@@ -42,7 +42,7 @@ INVALID_BDB_VER=	48 6
 USE_LDCONFIG=		yes
 BUILD_WRKSRC?=		${WRKSRC}/cpp
 INSTALL_WRKSRC?=	${WRKSRC}/cpp
-PORTSCOUT=		limit:^3\.6\.
+PORTSCOUT=		limit:^v3\.6\.
 USE_GITHUB=		yes
 GH_ACCOUNT=		zeroc-ice
 GH_PROJECT=		ice
diff --git a/devel/py-ice/Makefile b/devel/py-ice/Makefile
index e38b755419cf..7c2bd64a6db1 100644
--- a/devel/py-ice/Makefile
+++ b/devel/py-ice/Makefile
@@ -4,7 +4,7 @@
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	freebsd@grem.de
+MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	Ice (Internet Communications Engine) language mapping for Python
 
 LICENSE=	GPLv2
diff --git a/sysutils/bhyve-rc/Makefile b/sysutils/bhyve-rc/Makefile
index 6dd41054270e..cf40ea63b885 100644
--- a/sysutils/bhyve-rc/Makefile
+++ b/sysutils/bhyve-rc/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	# none
 DISTFILES=	# none
 EXTRACT_ONLY=	# none
 
-MAINTAINER=	freebsd@grem.de
+MAINTAINER=	grembo@FreeBSD.org
 COMMENT=	FreeBSD RC script for starting bhyve guests in tmux
 
 RUN_DEPENDS=	tmux:sysutils/tmux