diff --git a/Mk/Uses/cpe.mk b/Mk/Uses/cpe.mk
index 6f6c79164baf..1ca714316b09 100644
--- a/Mk/Uses/cpe.mk
+++ b/Mk/Uses/cpe.mk
@@ -16,7 +16,7 @@
 #			otherwise ${ARCH}.
 # CPE_OTHER		Defaults to ${PORTREVISION} if non-zero.
 #
-# MAINTAINER: ports-secteam@freebsd.org
+# MAINTAINER: ports-secteam@FreeBSD.org
 
 .if !defined(_INCLUDE_USES_CPE_MK)
 _INCLUDE_USES_CPE_MK=    yes
diff --git a/Tools/scripts/portsvar.sh b/Tools/scripts/portsvar.sh
index db8f05868171..a30b2d1290dc 100755
--- a/Tools/scripts/portsvar.sh
+++ b/Tools/scripts/portsvar.sh
@@ -29,7 +29,7 @@
 #
 # $FreeBSD$
 #
-# MAINTAINER= daichi@freebsd.org
+# MAINTAINER= daichi@FreeBSD.org
 
 usage_msg="usage:
     portsvar.sh [-a] [-e] [-w target] [-h] [var=val ...] var1 [var2 ...]
diff --git a/comms/qtel/Makefile b/comms/qtel/Makefile
index b1013233b4ea..5c66c185841b 100644
--- a/comms/qtel/Makefile
+++ b/comms/qtel/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	qtel
 PORTREVISION=	1
 
-MAINTAINER=	hamradio@freebsd.org
+MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Qtel Echolink client
 
 LICENSE=	GPLv2
diff --git a/databases/rocksdb-lite/Makefile b/databases/rocksdb-lite/Makefile
index 8546c3d2d4eb..876a9fbf129f 100644
--- a/databases/rocksdb-lite/Makefile
+++ b/databases/rocksdb-lite/Makefile
@@ -1,7 +1,7 @@
 # Created by: David Thiel <lx@FreeBSD.org>
 # $FreeBSD$
 
-MAINTAINER=	lx@freebsd.org
+MAINTAINER=	lx@FreeBSD.org
 COMMENT=	Persistent key-value store for fast storage environments (lite version)
 
 LITE=		yes
diff --git a/editors/plume-creator-devel/Makefile b/editors/plume-creator-devel/Makefile
index 2c369b2e0ed0..7a22251172c5 100644
--- a/editors/plume-creator-devel/Makefile
+++ b/editors/plume-creator-devel/Makefile
@@ -5,7 +5,7 @@ PORTVERSION=	${DATE}
 CATEGORIES=	editors
 MASTER_SITES=	http://deponie.yamagi.org/freebsd/distfiles/plume-creator/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open source tool for novelists
 
 LICENSE=	GPLv3+
diff --git a/games/chessx/Makefile b/games/chessx/Makefile
index 87c3908f219b..9e6ae52a8c49 100644
--- a/games/chessx/Makefile
+++ b/games/chessx/Makefile
@@ -6,7 +6,7 @@ PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt 4 chess database application
 
 LICENSE=	GPLv2+
diff --git a/sysutils/burp/Makefile b/sysutils/burp/Makefile
index 94d1da65a21c..92bdf2a4efe0 100644
--- a/sysutils/burp/Makefile
+++ b/sysutils/burp/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.4.40
 PORTREVISION=	1
 CATEGORIES=	sysutils
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Network backup and restore program
 
 LICENSE=	AGPLv3