--- tcl-modules/Makefile	
+++ tcl-modules/Makefile	
@@ -6,13 +6,13 @@ 
 #
 
 PORTNAME=	tcl-modules
 PORTREVISION=
 
-MAINTAINER=	mm@FreeBSD.org
+MAINTAINER=	TclTk@FreeBSD.org
 COMMENT=	Tcl common modules
 
 BUILDING_TCL_TM=	yes
 
 MASTERDIR=	${.CURDIR}/../tcl85
 
 .include	"${MASTERDIR}/Makefile"
--- tcl83/Makefile	
+++ tcl83/Makefile	
@@ -6,11 +6,11 @@ 
 PORTREVISION=	8
 CATEGORIES=	lang tcl
 MASTER_SITES=	SF/${PORTNAME}/Tcl/${PORTVERSION}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
-MAINTAINER=	c.petrik.sosa@gmail.com
+MAINTAINER=	TclTk@FreeBSD.org
 COMMENT=	Tool Command Language
 
 PORTSCOUT=	limit:^8\.3\.
 
 LATEST_LINK=	tcl83
--- tcl84-thread/Makefile	
+++ tcl84-thread/Makefile	
@@ -1,13 +1,13 @@ 
 # Created by: Pav Lucistnik <pav@FreeBSD.org>
 # $FreeBSD: head/lang/tcl84-thread/Makefile 305074 2012-09-30 06:25:19Z rm $
 
 PORTNAME=	tcl
 
-MAINTAINER=	c.petrik.sosa@gmail.com
+MAINTAINER=	TclTk@FreeBSD.org
 COMMENT=	Tool command language (threads support)
 
 BUILDING_TCL_THREADS=	yes
 
 MASTERDIR=	${.CURDIR}/../tcl84
 
 .include "${MASTERDIR}/Makefile"
--- tcl84/Makefile	
+++ tcl84/Makefile	
@@ -8,11 +8,11 @@ 
 CATEGORIES=	lang tcl
 MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION}
 PKGNAMESUFFIX?=	${THREADS_SUFFIX}${PKGNAMESUFFIX2}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
-MAINTAINER=	c.petrik.sosa@gmail.com
+MAINTAINER=	TclTk@FreeBSD.org
 COMMENT?=	Tool Command Language
 
 LICENSE=	BSD
 
 LATEST_LINK?=	tcl84
--- tcl85-thread/Makefile	
+++ tcl85-thread/Makefile	
@@ -1,13 +1,13 @@ 
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD: head/lang/tcl85-thread/Makefile 305074 2012-09-30 06:25:19Z rm $
 
 PORTNAME=	tcl
 
-MAINTAINER=	c.petrik.sosa@gmail.com
+MAINTAINER=	TclTk@FreeBSD.org
 COMMENT=	Tool command language (threads support)
 
 BUILDING_TCL_THREADS=	yes
 
 MASTERDIR=	${.CURDIR}/../tcl85
 
 .include	"${MASTERDIR}/Makefile"
--- tcl85/Makefile	
+++ tcl85/Makefile	
@@ -6,11 +6,11 @@ 
 CATEGORIES=	lang
 MASTER_SITES=	SF/tcl/Tcl/${PORTVERSION}
 PKGNAMESUFFIX?=		${THREADS_SUFFIX}${PKGNAMESUFFIX2}
 DISTNAME=	tcl${PORTVERSION}-src
 
-MAINTAINER=	c.petrik.sosa@gmail.com
+MAINTAINER=	TclTk@FreeBSD.org
 COMMENT?=	Tool Command Language
 
 LICENSE=	BSD
 
 LATEST_LINK?=	tcl85