diff --git a/www/firefox-devel/Makefile b/www/firefox-devel/Makefile
index 4bb4b2ca92d0..d0c5e77840d8 100644
--- a/www/firefox-devel/Makefile
+++ b/www/firefox-devel/Makefile
@@ -10,11 +10,11 @@
 PORTNAME=		phoenix
 PORTVERSION=		0.5
 PORTREVISION=		4
-CATEGORIES=		www # pita
+CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
 MASTER_SITE_SUBDIR=	alane
 
-MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+MAINTAINER=		gnome@freebsd.org
 COMMENT=	Phoenix is a fast, low-overhead browser from the Mozilla project
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 4bb4b2ca92d0..d0c5e77840d8 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -10,11 +10,11 @@
 PORTNAME=		phoenix
 PORTVERSION=		0.5
 PORTREVISION=		4
-CATEGORIES=		www # pita
+CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
 MASTER_SITE_SUBDIR=	alane
 
-MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+MAINTAINER=		gnome@freebsd.org
 COMMENT=	Phoenix is a fast, low-overhead browser from the Mozilla project
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 4bb4b2ca92d0..d0c5e77840d8 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -10,11 +10,11 @@
 PORTNAME=		phoenix
 PORTVERSION=		0.5
 PORTREVISION=		4
-CATEGORIES=		www # pita
+CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
 MASTER_SITE_SUBDIR=	alane
 
-MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+MAINTAINER=		gnome@freebsd.org
 COMMENT=	Phoenix is a fast, low-overhead browser from the Mozilla project
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/firefox10/Makefile b/www/firefox10/Makefile
index 4bb4b2ca92d0..d0c5e77840d8 100644
--- a/www/firefox10/Makefile
+++ b/www/firefox10/Makefile
@@ -10,11 +10,11 @@
 PORTNAME=		phoenix
 PORTVERSION=		0.5
 PORTREVISION=		4
-CATEGORIES=		www # pita
+CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
 MASTER_SITE_SUBDIR=	alane
 
-MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+MAINTAINER=		gnome@freebsd.org
 COMMENT=	Phoenix is a fast, low-overhead browser from the Mozilla project
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile
index 4bb4b2ca92d0..d0c5e77840d8 100644
--- a/www/firefox15/Makefile
+++ b/www/firefox15/Makefile
@@ -10,11 +10,11 @@
 PORTNAME=		phoenix
 PORTVERSION=		0.5
 PORTREVISION=		4
-CATEGORIES=		www # pita
+CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
 MASTER_SITE_SUBDIR=	alane
 
-MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+MAINTAINER=		gnome@freebsd.org
 COMMENT=	Phoenix is a fast, low-overhead browser from the Mozilla project
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/firefox3-devel/Makefile b/www/firefox3-devel/Makefile
index 4bb4b2ca92d0..d0c5e77840d8 100644
--- a/www/firefox3-devel/Makefile
+++ b/www/firefox3-devel/Makefile
@@ -10,11 +10,11 @@
 PORTNAME=		phoenix
 PORTVERSION=		0.5
 PORTREVISION=		4
-CATEGORIES=		www # pita
+CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
 MASTER_SITE_SUBDIR=	alane
 
-MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+MAINTAINER=		gnome@freebsd.org
 COMMENT=	Phoenix is a fast, low-overhead browser from the Mozilla project
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/firefox35/Makefile b/www/firefox35/Makefile
index 4bb4b2ca92d0..d0c5e77840d8 100644
--- a/www/firefox35/Makefile
+++ b/www/firefox35/Makefile
@@ -10,11 +10,11 @@
 PORTNAME=		phoenix
 PORTVERSION=		0.5
 PORTREVISION=		4
-CATEGORIES=		www # pita
+CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
 MASTER_SITE_SUBDIR=	alane
 
-MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+MAINTAINER=		gnome@freebsd.org
 COMMENT=	Phoenix is a fast, low-overhead browser from the Mozilla project
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile
index 4bb4b2ca92d0..d0c5e77840d8 100644
--- a/www/firefox36/Makefile
+++ b/www/firefox36/Makefile
@@ -10,11 +10,11 @@
 PORTNAME=		phoenix
 PORTVERSION=		0.5
 PORTREVISION=		4
-CATEGORIES=		www # pita
+CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
 MASTER_SITE_SUBDIR=	alane
 
-MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+MAINTAINER=		gnome@freebsd.org
 COMMENT=	Phoenix is a fast, low-overhead browser from the Mozilla project
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/flock/Makefile b/www/flock/Makefile
index 4bb4b2ca92d0..d0c5e77840d8 100644
--- a/www/flock/Makefile
+++ b/www/flock/Makefile
@@ -10,11 +10,11 @@
 PORTNAME=		phoenix
 PORTVERSION=		0.5
 PORTREVISION=		4
-CATEGORIES=		www # pita
+CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
 MASTER_SITE_SUBDIR=	alane
 
-MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+MAINTAINER=		gnome@freebsd.org
 COMMENT=	Phoenix is a fast, low-overhead browser from the Mozilla project
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/mozilla-firebird/Makefile b/www/mozilla-firebird/Makefile
index 4bb4b2ca92d0..d0c5e77840d8 100644
--- a/www/mozilla-firebird/Makefile
+++ b/www/mozilla-firebird/Makefile
@@ -10,11 +10,11 @@
 PORTNAME=		phoenix
 PORTVERSION=		0.5
 PORTREVISION=		4
-CATEGORIES=		www # pita
+CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
 MASTER_SITE_SUBDIR=	alane
 
-MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+MAINTAINER=		gnome@freebsd.org
 COMMENT=	Phoenix is a fast, low-overhead browser from the Mozilla project
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
diff --git a/www/phoenix/Makefile b/www/phoenix/Makefile
index 4bb4b2ca92d0..d0c5e77840d8 100644
--- a/www/phoenix/Makefile
+++ b/www/phoenix/Makefile
@@ -10,11 +10,11 @@
 PORTNAME=		phoenix
 PORTVERSION=		0.5
 PORTREVISION=		4
-CATEGORIES=		www # pita
+CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_LOCAL} ${BSD_WEBDIR}
 MASTER_SITE_SUBDIR=	alane
 
-MAINTAINER=		phoenix@freebsd.org # alane@fbsd and trevor@fbsd
+MAINTAINER=		gnome@freebsd.org
 COMMENT=	Phoenix is a fast, low-overhead browser from the Mozilla project
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \