- Use canonical form (ports@FreeBSD.org) in MAINTAINER line

107 files changed, 107 insertions, 107 deletions

diff --git a/archivers/9e/Makefile b/archivers/9e/Makefile
index e0eeb70daa0b..a600474d06b8 100644
--- a/archivers/9e/Makefile
+++ b/archivers/9e/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	archivers
 MASTER_SITES=	http://www.eecs.harvard.edu/~wkj/Software/9e/
 DISTNAME=	9e
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Explode Plan9 archives
 
 do-install:
diff --git a/archivers/macutils/Makefile b/archivers/macutils/Makefile
index 948879d2d91f..44172bede62b 100644
--- a/archivers/macutils/Makefile
+++ b/archivers/macutils/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	utils/compress
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for Apple Macintosh files
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/astro/sattrack/Makefile b/astro/sattrack/Makefile
index d0b530d204ea..20f36282083a 100644
--- a/astro/sattrack/Makefile
+++ b/astro/sattrack/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	astro
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	asami/LOCAL_PORTS
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Real-time satellite tracking and orbit propagation program
 
 USE_XLIB=	yes
diff --git a/audio/beep/Makefile b/audio/beep/Makefile
index 50c88ad1216a..2da08d1c4896 100644
--- a/audio/beep/Makefile
+++ b/audio/beep/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.ugh.net.au/pub/unix/beep/ \
 		ftp://ftp.megamirror.com/pub/ugh/unix/beep/ \
 		http://ftp.megamirror.com/pub/ugh/unix/beep/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Beeps a certain duration and pitch out of the PC Speaker
 
 MAN1=		beep.1
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index a0bc31dca9ba..eb32ff41f000 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/sound/players
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MOD/S3M/MTM tracker that does its own DSP, uses VoxWare v2.90+
 
 MAN1=		nspmod.1
diff --git a/audio/play/Makefile b/audio/play/Makefile
index 10fb82b98a4f..4405794c59e3 100644
--- a/audio/play/Makefile
+++ b/audio/play/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.0
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_PORTS_JP}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple audio file player
 
 MANLANG=	ja
diff --git a/audio/raproxy/Makefile b/audio/raproxy/Makefile
index 6322c4b9cfda..f66aa1850dde 100644
--- a/audio/raproxy/Makefile
+++ b/audio/raproxy/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	audio net
 MASTER_SITES=	http://docs.real.com/docs/proxy/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Progressive Networks RealAudio Proxy Kit 3.0 beta 1
 
 # Get it through http://www.real.com/firewall/fwdload/index.html
diff --git a/audio/rio/Makefile b/audio/rio/Makefile
index bd3fa51cc6bb..4db4d51b2696 100644
--- a/audio/rio/Makefile
+++ b/audio/rio/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.world.co.uk/sba/
 DISTNAME=	rio007
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for transferring files to and from the Diamond Rio .mp3 player
 
 WRKSRC=		${WRKDIR}/rio107
diff --git a/audio/splaytk/Makefile b/audio/splaytk/Makefile
index 88b0e5baf791..208d86d9c175 100644
--- a/audio/splaytk/Makefile
+++ b/audio/splaytk/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=		audio
 MASTER_SITES=		${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	apps/sound/players
 
-MAINTAINER=		ports@freebsd.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=	A tk based interface for splay
 
 RUN_DEPENDS=	splay:${PORTSDIR}/audio/splay \
diff --git a/audio/tclmidi/Makefile b/audio/tclmidi/Makefile
index ff918b727460..7a184ecfc995 100644
--- a/audio/tclmidi/Makefile
+++ b/audio/tclmidi/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.cs.ruu.nl/pub/MIDI/PROGRAMS/
 # despite references on the homepage to ftp.xor.com, that server
 # doesn't work - edwin 20021227
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A language designed for creating and editing standard MIDI files
 
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
diff --git a/audio/workman/Makefile b/audio/workman/Makefile
index b82a18d9ec3b..d00501fa2f70 100644
--- a/audio/workman/Makefile
+++ b/audio/workman/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications/WorkMan
 DISTNAME=	WorkMan-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Look-based CD player tool
 
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
diff --git a/audio/xmix/Makefile b/audio/xmix/Makefile
index f3de9bdc8fa6..ad3886b3fc90 100644
--- a/audio/xmix/Makefile
+++ b/audio/xmix/Makefile
@@ -15,7 +15,7 @@ PATCH_SITES=	${MASTER_SITES}
 PATCH_SITE_SUBDIR=	${MASTER_SITE_SUBDIR}
 PATCHFILES=	xmix-2.1.mixers.patch
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Mixer for X Window System
 
 USE_IMAKE=	yes
diff --git a/databases/cyrus-imspd/Makefile b/databases/cyrus-imspd/Makefile
index 225e1b00838c..fced8a6eb9ef 100644
--- a/databases/cyrus-imspd/Makefile
+++ b/databases/cyrus-imspd/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The cyrus IMSP (Internet Message Support Protocol) server
 
 LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl
diff --git a/databases/p5-DBD-File/Makefile b/databases/p5-DBD-File/Makefile
index 2a3e37487f54..2778771b9d3a 100644
--- a/databases/p5-DBD-File/Makefile
+++ b/databases/p5-DBD-File/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBD
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Base class for writing DBI drivers for plain files
 
 BUILD_DEPENDS=	${SITE_PERL}/SQL/Statement.pm:${PORTSDIR}/databases/p5-SQL-Statement
diff --git a/databases/p5-DBD-RAM/Makefile b/databases/p5-DBD-RAM/Makefile
index 707f3dce5325..bb09bb3bf7a4 100644
--- a/databases/p5-DBD-RAM/Makefile
+++ b/databases/p5-DBD-RAM/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBD
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DBI driver for files and data structures
 
 BUILD_DEPENDS+=	${SITE_PERL}/DBD/File.pm:${PORTSDIR}/databases/p5-DBD-File
diff --git a/databases/p5-GDBM/Makefile b/databases/p5-GDBM/Makefile
index fa34aef3af40..ad92c146ae71 100644
--- a/databases/p5-GDBM/Makefile
+++ b/databases/p5-GDBM/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../src
 DISTNAME=	perl5.005_03
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl module to use the GNU Data Base Manager (gdbm)
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
diff --git a/deskutils/gdeskcal-skins/Makefile b/deskutils/gdeskcal-skins/Makefile
index f15715853755..368ecd45affb 100644
--- a/deskutils/gdeskcal-skins/Makefile
+++ b/deskutils/gdeskcal-skins/Makefile
@@ -20,7 +20,7 @@ DISTFILES=	gnometheme.tar.gz \
 		tiny_and_simple.tar.gz \
 		LCD.tar.gz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Skins for gdeskcal
 
 RUN_DEPENDS=	${X11BASE}/bin/gdeskcal:${PORTSDIR}/deskutils/gdeskcal
diff --git a/deskutils/gdeskcal/Makefile b/deskutils/gdeskcal/Makefile
index eec484130a15..8660f3c539c4 100644
--- a/deskutils/gdeskcal/Makefile
+++ b/deskutils/gdeskcal/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	deskutils python gnome
 MASTER_SITES=	http://www.pycage.de/download/
 DISTNAME=	gDeskCal-${PORTVERSION:S/./_/}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A calendar for the gnome2 desktop with smooth alpha-blending
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2
diff --git a/devel/libgetline/Makefile b/devel/libgetline/Makefile
index 2ea329227d6b..2e22efcbfeca 100644
--- a/devel/libgetline/Makefile
+++ b/devel/libgetline/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp2.caldera.com/pub/skunkware/src/libraries/
 DISTNAME=	${PORTNAME}-39-src
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small, portable, and easy to use command line library
 
 MAN3=		getline.3
diff --git a/devel/p5-Log-Agent-Logger/Makefile b/devel/p5-Log-Agent-Logger/Makefile
index 0095026b27a7..d2a0dbb815d6 100644
--- a/devel/p5-Log-Agent-Logger/Makefile
+++ b/devel/p5-Log-Agent-Logger/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Log
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Log::Agent::Logger - a logging interface for perl
 
 BUILD_DEPENDS=	${SITE_PERL}/Log/Agent.pm:${PORTSDIR}/devel/p5-Log-Agent \
diff --git a/devel/sourcenav/Makefile b/devel/sourcenav/Makefile
index 9304b271fcd0..f7edfddd2af1 100644
--- a/devel/sourcenav/Makefile
+++ b/devel/sourcenav/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Source code analysis tool
 
 LIB_DEPENDS=	tcl83.1:${PORTSDIR}/lang/tcl83 \
diff --git a/devel/tkcon/Makefile b/devel/tkcon/Makefile
index f90e0a299279..a68e2e4f9eb7 100644
--- a/devel/tkcon/Makefile
+++ b/devel/tkcon/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	devel tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=${PORTNAME}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tk console for Tcl
 
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
diff --git a/dns/ddup/Makefile b/dns/ddup/Makefile
index 1ea66887c7ba..da84404c5373 100644
--- a/dns/ddup/Makefile
+++ b/dns/ddup/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	dns
 MASTER_SITES=	${MASTER_SITES_LOCAL}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-unix
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A DynDNS.org client for UNIX (Now support NIC v2.0)
 
 USE_REINPLACE=	yes
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index bebb134d3e25..bad103363ad7 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -15,7 +15,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX}
 .endif
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple GTK-based text/HTML editor
 
 DOCVERSION=	1.2.0
diff --git a/emulators/aftp/Makefile b/emulators/aftp/Makefile
index d67ab25908f1..f4a88a93cf41 100644
--- a/emulators/aftp/Makefile
+++ b/emulators/aftp/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	ftp://ftp.apple.asimov.net/pub/apple_II/utility/
 DISTNAME=	${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A ftp-like shell for accessing Apple II disk images
 
 MAN1=		aftp.1
diff --git a/emulators/vmware_xf4mod/Makefile b/emulators/vmware_xf4mod/Makefile
index 3d09295ae26c..7814b2b3eeba 100644
--- a/emulators/vmware_xf4mod/Makefile
+++ b/emulators/vmware_xf4mod/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.vmware.com/software/
 DISTNAME=	vmware_drv.o
 EXTRACT_SUFX=	# none
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A XFree86 4.x driver module for VMware guests
 
 RUN_DEPENDS=	XFree86:${PORTSDIR}/x11/XFree86-4
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 212e11602998..c3142aa836e3 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.labyrinth.net.au/~trandor/abuse/files/
 DISTFILES=	abuse_datafiles.tar.gz
 EXTRACT_ONLY=	# empty
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The classic 2D action game Abuse
 
 RUN_DEPENDS=	abuse.sdl:${PORTSDIR}/games/abuse_sdl
diff --git a/games/frabs/Makefile b/games/frabs/Makefile
index 8fe679ea5985..ff94e0c4e7b2 100644
--- a/games/frabs/Makefile
+++ b/games/frabs/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	http://www.cs.uidaho.edu/~cass0664/fRaBs/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The fRaBs (Free Abuse) data files for the Abuse game engine
 
 RUN_DEPENDS=	abuse.sdl:${PORTSDIR}/games/abuse_sdl
diff --git a/games/oonsoo/Makefile b/games/oonsoo/Makefile
index f1db5ef14149..6e6b1cd5f4d0 100644
--- a/games/oonsoo/Makefile
+++ b/games/oonsoo/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.redlinelabs.com/pub/oonsoo/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A solitaire card game for X
 
 USE_XLIB=	yes
diff --git a/games/qcc/Makefile b/games/qcc/Makefile
index b31e90a31923..d0314e951fbe 100644
--- a/games/qcc/Makefile
+++ b/games/qcc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES=	ftp://ftp.idsoftware.com/idstuff/source/
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The QuakeC compiler, for building custom games of Quake
 
 WRKSRC=		${WRKDIR}/send
diff --git a/games/rockdodger/Makefile b/games/rockdodger/Makefile
index d0e88c20240c..4f874ef6e1df 100644
--- a/games/rockdodger/Makefile
+++ b/games/rockdodger/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	games
 MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	spacerocks
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Addictive rock-dodging greeblie-killing platform game
 
 LIB_DEPENDS=	SDL-1.1.5:${PORTSDIR}/devel/sdl12 \
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 3e23db35d44f..9eb5656b05fb 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	games tcl84 tk84
 MASTER_SITES=	ftp://sources.redhat.com/pub/xconq/ \
 		ftp://unix.hensa.ac.uk/mirrors/sources.redhat.com/pub/xconq/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical multi-player strategy game and game design system
 
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
diff --git a/games/xminesweep/Makefile b/games/xminesweep/Makefile
index ad5dc53f7709..a8185793b4ac 100644
--- a/games/xminesweep/Makefile
+++ b/games/xminesweep/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	ftp://ftp.netlab.is.tsukuba.ac.jp/pub/X/our_collections/games/ \
 DISTNAME=	${PORTNAME}${PORTVERSION}
 EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X11 minesweeper game
 
 USE_IMAKE=	yes
diff --git a/games/xripple/Makefile b/games/xripple/Makefile
index 692e65a17bb2..8bee9de4a330 100644
--- a/games/xripple/Makefile
+++ b/games/xripple/Makefile
@@ -18,7 +18,7 @@ MASTER_SITES=	ftp://crydee.sai.msu.ru/zeus/X11/contrib/ \
 		ftp://ftp.pconline.com/users/gjerde/enlightenment/
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X program to make bottom of screen ripple like a pool of water
 
 USE_IMAKE=	yes
diff --git a/graphics/crw/Makefile b/graphics/crw/Makefile
index ea00d05d661f..91bcf54a7d22 100644
--- a/graphics/crw/Makefile
+++ b/graphics/crw/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.03
 CATEGORIES=	graphics
 MASTER_SITES=	http://apollo.backplane.com/FreeBSDPorts/
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility to process Canon camera RAW (.crw) files
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
diff --git a/graphics/ecg2png/Makefile b/graphics/ecg2png/Makefile
index 0daa3c6d0507..ec43bc316378 100644
--- a/graphics/ecg2png/Makefile
+++ b/graphics/ecg2png/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.cardiothink.com/downloads/ecg2png/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	"Converts scanned 12-lead electrocardiograms into PNGs"
 
 LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
diff --git a/graphics/gimp-manual-html/Makefile b/graphics/gimp-manual-html/Makefile
index 17d1d186c584..25e97347755c 100644
--- a/graphics/gimp-manual-html/Makefile
+++ b/graphics/gimp-manual-html/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	graphics
 MASTER_SITES=	ftp://manual.gimp.org/pub/manual/
 PKGNAMESUFFIX=	-${DOCFORMAT}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The user manual for the GNU Image Manipulation Program (GIMP)
 
 .if !defined(DOCFORMAT)
diff --git a/graphics/p5-Image-Imlib2/Makefile b/graphics/p5-Image-Imlib2/Makefile
index 0b0b9b48e60c..8c8b3f18370c 100644
--- a/graphics/p5-Image-Imlib2/Makefile
+++ b/graphics/p5-Image-Imlib2/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Image
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl interface to the Imlib2 image library
 
 LIB_DEPENDS=	Imlib2.2:${PORTSDIR}/graphics/imlib2
diff --git a/japanese/ack/Makefile b/japanese/ack/Makefile
index 760c085c12f6..f98e54d24096 100644
--- a/japanese/ack/Makefile
+++ b/japanese/ack/Makefile
@@ -11,7 +11,7 @@ MASTER_SITES=	ftp://ftp.vector.co.jp/pack/unix/util/text/conv/code/
 DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Kanji code converter
 
 ALL_TARGET=	ack
diff --git a/japanese/gn-gnspool/Makefile b/japanese/gn-gnspool/Makefile
index 8cac3b89abc1..a6b789d08527 100644
--- a/japanese/gn-gnspool/Makefile
+++ b/japanese/gn-gnspool/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	japanese news
 MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/misc/gn/
 DISTNAME=	gn-${PORTVERSION}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple Japanese Newsreader with Local Spool Support
 
 # The program ``configure'' sometimes issue questions and
diff --git a/japanese/nvi-euc-jp/Makefile b/japanese/nvi-euc-jp/Makefile
index 8196ccf1f22c..b85aca814ca2 100644
--- a/japanese/nvi-euc-jp/Makefile
+++ b/japanese/nvi-euc-jp/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
 CATEGORIES=	japanese editors
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A clone of vi/ex, with multilingual patch, default settings for euc-jp
 
 CONFIGURE_ARGS=        --enable-multibyte=euc-jp --program-prefix=n --enable-canna
diff --git a/japanese/nvi-iso-2022-jp/Makefile b/japanese/nvi-iso-2022-jp/Makefile
index ee5301ab21d1..8e33f1582c59 100644
--- a/japanese/nvi-iso-2022-jp/Makefile
+++ b/japanese/nvi-iso-2022-jp/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
 CATEGORIES=	japanese editors
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clone of vi/ex, with multilingual patch, default settings for iso-2022-jp
 
 CONFIGURE_ARGS=        --enable-multibyte=iso-2022-jp --program-prefix=n --enable-canna
diff --git a/japanese/nvi-sjis/Makefile b/japanese/nvi-sjis/Makefile
index 646bb2c46507..b39db8dfc30c 100644
--- a/japanese/nvi-sjis/Makefile
+++ b/japanese/nvi-sjis/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
 
 CATEGORIES=	japanese editors
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A clone of vi/ex, with multilingual patch, default settings for sjis
 
 CONFIGURE_ARGS=        --enable-multibyte=sjis --program-prefix=n --enable-canna
diff --git a/japanese/xyagamo/Makefile b/japanese/xyagamo/Makefile
index a2d3b0348707..c33a4a41a54d 100644
--- a/japanese/xyagamo/Makefile
+++ b/japanese/xyagamo/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.1b
 CATEGORIES=	japanese games
 MASTER_SITES=	http://www.dokidoki.ne.jp/home2/shinmaru/mahjong/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese version of a four player mahjong game
 
 USE_X_PREFIX=	YES
diff --git a/korean/nvi-euc-kr/Makefile b/korean/nvi-euc-kr/Makefile
index 480d298f918f..eb9b7c901748 100644
--- a/korean/nvi-euc-kr/Makefile
+++ b/korean/nvi-euc-kr/Makefile
@@ -11,7 +11,7 @@ MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
 
 CATEGORIES=	korean editors
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A clone of vi/ex, with multilingual patch, default settings for euc-kr
 
 CONFIGURE_ARGS=        --enable-multibyte=euc-kr --program-prefix=n
diff --git a/korean/nvi-iso-2022-kr/Makefile b/korean/nvi-iso-2022-kr/Makefile
index 126633023692..b0353064593e 100644
--- a/korean/nvi-iso-2022-kr/Makefile
+++ b/korean/nvi-iso-2022-kr/Makefile
@@ -11,7 +11,7 @@ MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
 
 CATEGORIES=	korean editors
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clone of vi/ex, with multilingual patch, default settings for iso-2022-kr
 
 CONFIGURE_ARGS=        --enable-multibyte=iso-2022-kr --program-prefix=n
diff --git a/lang/elisp-manual/Makefile b/lang/elisp-manual/Makefile
index c1bf7c5bc837..13a19e931f5e 100644
--- a/lang/elisp-manual/Makefile
+++ b/lang/elisp-manual/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Emacs Lisp reference manual
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/./-/}
diff --git a/lang/intel2gas/Makefile b/lang/intel2gas/Makefile
index 0c9f7d1af37b..b28aa74ffad9 100644
--- a/lang/intel2gas/Makefile
+++ b/lang/intel2gas/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.3.3
 CATEGORIES=	lang
 MASTER_SITES=	http://www.niksula.cs.hut.fi/~mtiihone/intel2gas/
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts Intel assembly language (nasm) to AT&T syntax (gas)
 
 GNU_CONFIGURE=	yes
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 45d838be77ef..594aa6ed061d 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl
 DISTNAME=	itcl${PORTVERSION}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	[incr Tcl] (A.K.A. "itcl")
 
 LIB_DEPENDS=	tcl83:${PORTSDIR}/lang/tcl83
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index 3b65304dfe09..df44c9343f95 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	lang tcl80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
 DISTNAME=	tcl8.0.5
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool Command Language
 
 NO_LATEST_LINK=	yes
diff --git a/lang/wamcc/Makefile b/lang/wamcc/Makefile
index ca053cf78b86..12eda66f15cd 100644
--- a/lang/wamcc/Makefile
+++ b/lang/wamcc/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/contraintes/wamcc/
 DISTFILES=	wamcc2.23.tar.gz prg.tar.Z
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Prolog-to-C translator from Inria
 
 DIST_SUBDIR=	wamcc
diff --git a/mail/mahogany/Makefile b/mail/mahogany/Makefile
index 3b7c4f0666cf..76880722bdc6 100644
--- a/mail/mahogany/Makefile
+++ b/mail/mahogany/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=		mail
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mahogany
 
-MAINTAINER=		ports@freebsd.org
+MAINTAINER=		ports@FreeBSD.org
 COMMENT=		An X11 mail and news client
 
 LIB_DEPENDS+=		wx_gtk2-2.4.0:${PORTSDIR}/x11-toolkits/wxgtk2
diff --git a/math/calctool/Makefile b/math/calctool/Makefile
index 87dd7ea3c8de..e9415d80de97 100644
--- a/math/calctool/Makefile
+++ b/math/calctool/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_LOCAL}
 DISTNAME=	calctool-2.4pl13
 MASTER_SITE_SUBDIR=	nsayer
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A multi-GUI (text, X, xview, NeWS, sunview) calculator program
 
 USE_X_PREFIX=	yes
diff --git a/misc/crosspad/Makefile b/misc/crosspad/Makefile
index 58b91717ca74..1fcca06ac2ca 100644
--- a/misc/crosspad/Makefile
+++ b/misc/crosspad/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	19991202
 CATEGORIES=	misc
 MASTER_SITES=	ftp://ftp.itojun.org/pub/misc/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Crosspad data downloader/converter
 
 GNU_CONFIGURE=	yes
diff --git a/misc/flyway/Makefile b/misc/flyway/Makefile
index f4f8b3369613..da177a45e65c 100644
--- a/misc/flyway/Makefile
+++ b/misc/flyway/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	0.3.1
 CATEGORIES=	misc python
 MASTER_SITES=	http://www.bellz.org/flyway/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A VFR/IFR Route Planner for Pilots
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/qt.py:${PORTSDIR}/x11-toolkits/py-qt
diff --git a/misc/sshbuddy/Makefile b/misc/sshbuddy/Makefile
index dd704e180d85..655b0f58a1db 100644
--- a/misc/sshbuddy/Makefile
+++ b/misc/sshbuddy/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.05
 CATEGORIES=	misc
 MASTER_SITES=	http://www.linuxmafia.com/pub/linux/security/sshbuddy/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple and small GUI utility to manage ssh sessions
 
 RUN_DEPENDS=	expectk:${PORTSDIR}/lang/expect
diff --git a/misc/viz/Makefile b/misc/viz/Makefile
index 28f48a12e508..1491cfc8c40a 100644
--- a/misc/viz/Makefile
+++ b/misc/viz/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	fenner
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert invisible (binary) characters to a visible form
 
 MAN1=		viz.1 inviz.1
diff --git a/net-mgmt/choparp/Makefile b/net-mgmt/choparp/Makefile
index 0bc035642511..646f218f50b0 100644
--- a/net-mgmt/choparp/Makefile
+++ b/net-mgmt/choparp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	choparp
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple proxy arp daemon
 
 MAN8=		choparp.8
diff --git a/net-mgmt/flow-extract/Makefile b/net-mgmt/flow-extract/Makefile
index 50f74af5827a..54d47a64e65e 100644
--- a/net-mgmt/flow-extract/Makefile
+++ b/net-mgmt/flow-extract/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://security.uchicago.edu/tools/net-forensics/files/
 DISTNAME=	flowextract-${PORTVERSION}
 EXTRACT_SUFX=	.cpio.gz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cisco NetFlow awk-like extracting tool
 
 BUILD_DEPENDS=	flow-cat:${PORTSDIR}/net/flow-tools
diff --git a/net/choparp/Makefile b/net/choparp/Makefile
index 0bc035642511..646f218f50b0 100644
--- a/net/choparp/Makefile
+++ b/net/choparp/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	choparp
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple proxy arp daemon
 
 MAN8=		choparp.8
diff --git a/net/flow-extract/Makefile b/net/flow-extract/Makefile
index 50f74af5827a..54d47a64e65e 100644
--- a/net/flow-extract/Makefile
+++ b/net/flow-extract/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://security.uchicago.edu/tools/net-forensics/files/
 DISTNAME=	flowextract-${PORTVERSION}
 EXTRACT_SUFX=	.cpio.gz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cisco NetFlow awk-like extracting tool
 
 BUILD_DEPENDS=	flow-cat:${PORTSDIR}/net/flow-tools
diff --git a/net/ipw/Makefile b/net/ipw/Makefile
index 4d520c4aa650..e1b0366a6087 100644
--- a/net/ipw/Makefile
+++ b/net/ipw/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://www.mjhb.com/ipw/
 DISTNAME=	ipw
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A "whois" replacement that automatically queries several databases
 
 NO_WRKSUBDIR=	yes
diff --git a/net/merlinmon/Makefile b/net/merlinmon/Makefile
index f449c304183f..8145f21d534b 100644
--- a/net/merlinmon/Makefile
+++ b/net/merlinmon/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	nsayer
 DISTNAME=	merlin-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A curses app that displays the status of a Novatel CDPD modem device
 
 NO_WRKSUBDIR=	yes
diff --git a/net/p5-Net-SSH/Makefile b/net/p5-Net-SSH/Makefile
index a7de46ae9cdd..420cff646926 100644
--- a/net/p5-Net-SSH/Makefile
+++ b/net/p5-Net-SSH/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Net
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl5 module to access and use ssh protocol
 
 PERL_CONFIGURE=	yes
diff --git a/net/poink/Makefile b/net/poink/Makefile
index 7ea522c668c6..7792671a7bf8 100644
--- a/net/poink/Makefile
+++ b/net/poink/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	net
 MASTER_SITES=	http://coredump.cx/~lcamtuf/soft/
 DISTNAME=	${PORTNAME}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Nosuid, secure ping like utility
 
 USE_ZIP=	yes
diff --git a/net/socks5/Makefile b/net/socks5/Makefile
index 2b8e604711be..568bca98fa07 100644
--- a/net/socks5/Makefile
+++ b/net/socks5/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	2
 CATEGORIES=	net security
 DISTNAME=	socks5-v1.0r11
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	SOCKS v5 application layer gateway and clients
 
 NO_CDROM=	"NEC has a funky license for this software"
diff --git a/news/p5-News-Article/Makefile b/news/p5-News-Article/Makefile
index 2205b021394b..18e7e29515c6 100644
--- a/news/p5-News-Article/Makefile
+++ b/news/p5-News-Article/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	News
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Object for handling Usenet articles in mail or news form
 
 RUN_DEPENDS=	${SITE_PERL}/Net/NNTP.pm:${PORTSDIR}/net/p5-Net \
diff --git a/palm/txt2pdbdoc/Makefile b/palm/txt2pdbdoc/Makefile
index 9c6d2a8a52b4..514540376f9f 100644
--- a/palm/txt2pdbdoc/Makefile
+++ b/palm/txt2pdbdoc/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.3
 CATEGORIES=	palm converters
 MASTER_SITES=	http://tirian.magd.ox.ac.uk/~dom/palm/files/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Converts plain text and HTML files to Palm Pilot Doc formats
 
 PREFIX=		${LOCALBASE}/
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 53502a0c7869..fde651222943 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -18,7 +18,7 @@ PATCHFILES=	gv_3.5.8-26.1.diff.gz
 PATCH_SITES=	http://security.debian.org/pool/updates/main/g/gv/
 PATCH_DIST_STRIP=	-p1
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A PostScript and PDF previewer
 
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
diff --git a/print/pkfonts300/Makefile b/print/pkfonts300/Makefile
index 9b52589b0e15..8bc27bd0436f 100644
--- a/print/pkfonts300/Makefile
+++ b/print/pkfonts300/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	pkfonts
 DISTFILES=	pk${RESOLUTION}.tar.gz
 # see below for RESOLUTION definition
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	English PK fonts, for ghostscripts, xdvi and so on
 
 DIST_SUBDIR=	pkfonts
diff --git a/print/xdvik/Makefile b/print/xdvik/Makefile
index 68dd6d005667..18a566637811 100644
--- a/print/xdvik/Makefile
+++ b/print/xdvik/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	20a
 CATEGORIES=	print
 MASTER_SITES=	http://www.tug.org/ftp/historic/systems/dviware/xdvik/
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DVI Previewer(kpathsearch) for X
 
 RUN_DEPENDS=	mf:${PORTSDIR}/print/tex
diff --git a/science/mmtk/Makefile b/science/mmtk/Makefile
index 1f1d1ae5bf40..52fac5dc538f 100644
--- a/science/mmtk/Makefile
+++ b/science/mmtk/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	science python
 MASTER_SITES=	http://starship.python.net/crew/hinsen/MMTK/
 DISTNAME=	MMTK-${PORTVERSION}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Open Source program library for molecular simulation applications
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/Scientific:${PORTSDIR}/math/py-scientific
diff --git a/security/fragrouter/Makefile b/security/fragrouter/Makefile
index 7b7b2441cde8..f46556ceefe3 100644
--- a/security/fragrouter/Makefile
+++ b/security/fragrouter/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	security
 MASTER_SITES=	# http://www.anzen.com/research/nidsbench/
 MASTER_SITE_SUBDIR=kris
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tool for testing network IDS implementations
 
 GNU_CONFIGURE=	yes
diff --git a/security/identify/Makefile b/security/identify/Makefile
index 8f3ee1efd115..9a9f74255e09 100644
--- a/security/identify/Makefile
+++ b/security/identify/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.7
 CATEGORIES=	security
 MASTER_SITES=	http://www.scn.rain.com/pub/security/authent/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Client side ident protocol daemon wrapper
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libident.a:${PORTSDIR}/security/libident
diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile
index e4373d5d39d9..33e7c95eeb86 100644
--- a/security/p5-PGP-Sign/Makefile
+++ b/security/p5-PGP-Sign/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	PGP
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Create detached PGP signatures for data
 
 PERL_CONFIGURE=	yes
diff --git a/sysutils/afio/Makefile b/sysutils/afio/Makefile
index f2f54b84db37..69260a852f61 100644
--- a/sysutils/afio/Makefile
+++ b/sysutils/afio/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	system/backup
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Archiver & backup program w/ builtin compression
 
 ALL_TARGET=	${PORTNAME}
diff --git a/sysutils/contool/Makefile b/sysutils/contool/Makefile
index 3a0cc7261a1b..b5a541b1a97e 100644
--- a/sysutils/contool/Makefile
+++ b/sysutils/contool/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	nsayer
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Console tool for openlook
 
 LIB_DEPENDS=	xview.3:${PORTSDIR}/x11-toolkits/xview
diff --git a/sysutils/cpdup/Makefile b/sysutils/cpdup/Makefile
index 5be0ee883e41..b37d889eb669 100644
--- a/sysutils/cpdup/Makefile
+++ b/sysutils/cpdup/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	sysutils
 MASTER_SITES=	http://apollo.backplane.com/FreeBSDPorts/
 #MASTER_SITE_SUBDIR=	cp
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A comprehensive filesystem mirroring program
 
 MAN1=		cpdup.1
diff --git a/sysutils/maint/Makefile b/sysutils/maint/Makefile
index f343c732f3b3..62c2ca3e154e 100644
--- a/sysutils/maint/Makefile
+++ b/sysutils/maint/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	0.5.2
 CATEGORIES=	sysutils python
 MASTER_SITES=	http://www.ukc.mirror.ac.uk/sites/ftp.freebsd.org/pub/FreeBSD/ports/distfiles/ \
 		http://people.FreeBSD.org/~foxfair/distfiles/
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	System maintenance package written in Python and CSH
 
 BUILD_DEPENDS=	cvsup:${PORTSDIR}/net/cvsup
diff --git a/sysutils/rc_subr/Makefile b/sysutils/rc_subr/Makefile
index 28731a118e4f..c21913d8ef3b 100644
--- a/sysutils/rc_subr/Makefile
+++ b/sysutils/rc_subr/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.16
 CATEGORIES=	sysutils
 MASTER_SITES=	ftp://ftp.westbend.net/pub/FreeBSD/ports/local-distfiles/rcNG/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Common startup and shutdown subroutines used by scripts
 
 NO_BUILD=	yes
diff --git a/textproc/diffutils/Makefile b/textproc/diffutils/Makefile
index ac3c6eaef519..a41c36b69a0e 100644
--- a/textproc/diffutils/Makefile
+++ b/textproc/diffutils/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	diffutils
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The GNU diff utilities
 
 USE_REINPLACE=	yes
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index 3e9c825e08dd..43ba5c053410 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -11,7 +11,7 @@ PORTVERSION=	4.12.6
 CATEGORIES=	textproc databases
 MASTER_SITES=	ftp://ftp.polito.it/pub/tools/unix/harvest/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Text search engine
 
 NO_CDROM=	"Restrictive copyright (don't sell for profit)"
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index 5e68cfe05067..bcbc52e9b027 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	textproc
 MASTER_SITES=	http://software.decisionsoft.com/software/pathan-1.2r2/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-2-src
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Validating XML parser from the Apache XML Project
 
 LIB_DEPENDS=	xerces-c.23:${PORTSDIR}/textproc/xerces-c2
diff --git a/textproc/p5-Text-ParagraphDiff/Makefile b/textproc/p5-Text-ParagraphDiff/Makefile
index 287642d79c6e..17d0331a6446 100644
--- a/textproc/p5-Text-ParagraphDiff/Makefile
+++ b/textproc/p5-Text-ParagraphDiff/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Text
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Visual difference for paragraphed text
 
 BUILD_DEPENDS=	${SITE_PERL}/Algorithm/Diff.pm:${PORTSDIR}/devel/p5-Algorithm-Diff \
diff --git a/www/mod_access_referer/Makefile b/www/mod_access_referer/Makefile
index 89fa502dad9d..4373b88b8240 100644
--- a/www/mod_access_referer/Makefile
+++ b/www/mod_access_referer/Makefile
@@ -11,7 +11,7 @@ CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	accessreferer
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An Apache module that provides access control based on Referer HTTP header
 
 USE_APACHE=	yes
diff --git a/www/p5-Apache-Filter/Makefile b/www/p5-Apache-Filter/Makefile
index ea3e4505a325..b1091a0b72ce 100644
--- a/www/p5-Apache-Filter/Makefile
+++ b/www/p5-Apache-Filter/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Apache
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl module to alter the output of previous handlers
 
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/mod_perl.pm:${PORTSDIR}/www/mod_perl
diff --git a/www/p5-HTML-Clean/Makefile b/www/p5-HTML-Clean/Makefile
index d0e76172a4d5..469d135f4d74 100644
--- a/www/p5-HTML-Clean/Makefile
+++ b/www/p5-HTML-Clean/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cleans up HTML code for web browsers, not humans
 
 PERL_CONFIGURE=	yes
diff --git a/www/p5-HTML-Tagset/Makefile b/www/p5-HTML-Tagset/Makefile
index 0dedc6dc8112..cac5fddf8454 100644
--- a/www/p5-HTML-Tagset/Makefile
+++ b/www/p5-HTML-Tagset/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	HTML
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Some useful data table in parsing HTML
 
 PERL_CONFIGURE=	yes
diff --git a/www/webglimpse/Makefile b/www/webglimpse/Makefile
index 9f16ee4eafca..a79b6845507f 100644
--- a/www/webglimpse/Makefile
+++ b/www/webglimpse/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www textproc
 MASTER_SITES=	ftp://ftp.deva.net/pub/sources/ir/glimpse/
 DISTNAME=	${PKGNAME}.src
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	WWW interface to Glimpse search engine
 
 RUN_DEPENDS+=	${LOCALBASE}/etc/apache/httpd.conf:${PORTSDIR}/${APACHE_PORT}
diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile
index dd2f3d3d46ef..dcdb44b3c5a4 100644
--- a/www/wwwcount/Makefile
+++ b/www/wwwcount/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www
 MASTER_SITES=	http://www.muquit.com/muquit/software/Count/src/wwwcount2.5/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Access counter, clock and date for WWW pages
 
 GNU_CONFIGURE=	yes
diff --git a/x11-fm/apotheke/Makefile b/x11-fm/apotheke/Makefile
index 38240c91169b..c82f6395954f 100644
--- a/x11-fm/apotheke/Makefile
+++ b/x11-fm/apotheke/Makefile
@@ -11,7 +11,7 @@ PORTREVISION=	1
 CATEGORIES=	x11-fm
 MASTER_SITES=	ftp://ftp.berlios.de/pub/apotheke/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A CVS view for Nautilus
 
 RUN_DEPENDS=	ssh-askpass:${PORTSDIR}/security/openssh-askpass
diff --git a/x11-fonts/tkfont/Makefile b/x11-fonts/tkfont/Makefile
index 92a7876e3334..3f456b7f640f 100644
--- a/x11-fonts/tkfont/Makefile
+++ b/x11-fonts/tkfont/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11-fonts tcl84 tk84
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	petef
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A Tk based replacement for xfontsel
 
 RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
diff --git a/x11-themes/kwin_flatcurve/Makefile b/x11-themes/kwin_flatcurve/Makefile
index 82a46b212cd7..670c75e1eb9e 100644
--- a/x11-themes/kwin_flatcurve/Makefile
+++ b/x11-themes/kwin_flatcurve/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://kde-look.org/content/files/
 DISTNAME=	4365-flatcurve-${PORTVERSION}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bluecurve style window decoration for KDEs WM
 
 USE_KDEBASE_VER=	3
diff --git a/x11-toolkits/bwidget/Makefile b/x11-toolkits/bwidget/Makefile
index 1b4e5c521098..6e486a810cae 100644
--- a/x11-toolkits/bwidget/Makefile
+++ b/x11-toolkits/bwidget/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	tcllib
 DISTNAME=	BWidget-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A high-level widget set for Tcl/Tk
 
 NO_BUILD=	yes
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index 34b2608092cc..56c0cd2370ea 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl
 DISTNAME=	itcl${PORTVERSION}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	[incr Tk] (A.K.A. "itk")
 
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
diff --git a/x11-toolkits/iwidgets/Makefile b/x11-toolkits/iwidgets/Makefile
index 56adecb05850..ea60aa091b03 100644
--- a/x11-toolkits/iwidgets/Makefile
+++ b/x11-toolkits/iwidgets/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=incrtcl
 DISTNAME=	itcl3.2
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	[incr Widgets] (A.K.A. "iwidgets")
 
 LIB_DEPENDS=	itk32.1:${PORTSDIR}/x11-toolkits/itk
diff --git a/x11-toolkits/py-wxPython/Makefile b/x11-toolkits/py-wxPython/Makefile
index eb013b3cbb10..fe39647c858e 100644
--- a/x11-toolkits/py-wxPython/Makefile
+++ b/x11-toolkits/py-wxPython/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	wxpython
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}Src-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python bindings for the wxWindows/GTK GUI toolkit
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
diff --git a/x11-toolkits/py-wxPython24/Makefile b/x11-toolkits/py-wxPython24/Makefile
index eb013b3cbb10..fe39647c858e 100644
--- a/x11-toolkits/py-wxPython24/Makefile
+++ b/x11-toolkits/py-wxPython24/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	wxpython
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}Src-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python bindings for the wxWindows/GTK GUI toolkit
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
diff --git a/x11-toolkits/py-wxPython26/Makefile b/x11-toolkits/py-wxPython26/Makefile
index eb013b3cbb10..fe39647c858e 100644
--- a/x11-toolkits/py-wxPython26/Makefile
+++ b/x11-toolkits/py-wxPython26/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	wxpython
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}Src-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python bindings for the wxWindows/GTK GUI toolkit
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
diff --git a/x11-toolkits/py-wxPython28/Makefile b/x11-toolkits/py-wxPython28/Makefile
index eb013b3cbb10..fe39647c858e 100644
--- a/x11-toolkits/py-wxPython28/Makefile
+++ b/x11-toolkits/py-wxPython28/Makefile
@@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR=	wxpython
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	${PORTNAME}Src-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Python bindings for the wxWindows/GTK GUI toolkit
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl
diff --git a/x11-toolkits/tk80/Makefile b/x11-toolkits/tk80/Makefile
index 92b1c1d1d673..2cae044e82a0 100644
--- a/x11-toolkits/tk80/Makefile
+++ b/x11-toolkits/tk80/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_TCLTK}
 MASTER_SITE_SUBDIR=	tcl8_0
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
-MAINTAINER=	ports@Freebsd.ORG
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical toolkit for TCL
 
 LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
diff --git a/x11-wm/icepref/Makefile b/x11-wm/icepref/Makefile
index 123dec76b004..308a3d7c9948 100644
--- a/x11-wm/icepref/Makefile
+++ b/x11-wm/icepref/Makefile
@@ -10,7 +10,7 @@ PORTVERSION=	1.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_NETBSD}
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A small graphical configuration utility for the Ice Window Manager
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/GTK.py:${PORTSDIR}/x11-toolkits/py-gtk
diff --git a/x11-wm/kwin_flatcurve/Makefile b/x11-wm/kwin_flatcurve/Makefile
index 82a46b212cd7..670c75e1eb9e 100644
--- a/x11-wm/kwin_flatcurve/Makefile
+++ b/x11-wm/kwin_flatcurve/Makefile
@@ -10,7 +10,7 @@ CATEGORIES=	x11-wm
 MASTER_SITES=	http://kde-look.org/content/files/
 DISTNAME=	4365-flatcurve-${PORTVERSION}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bluecurve style window decoration for KDEs WM
 
 USE_KDEBASE_VER=	3
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 3715c3ae80ad..c89b1faf0cc1 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An anti-aliased font support for gtk+
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
diff --git a/x11/mgapdesk/Makefile b/x11/mgapdesk/Makefile
index 4d83ef3874b9..55b97ab209e5 100644
--- a/x11/mgapdesk/Makefile
+++ b/x11/mgapdesk/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	ftp://ftp.matrox.com/pub/mga/archive/linux/2001/powerdesk_1_00_7/
 DISTNAME=	${PORTNAME}-1_00-7beta_src
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Matrox Powerdesk for *nix
 
 BUILD_DEPENDS=	XFree86:${PORTSDIR}/x11/XFree86-4
diff --git a/x11/tkgoodstuff/Makefile b/x11/tkgoodstuff/Makefile
index 3d4278300d8c..051b546eb38e 100644
--- a/x11/tkgoodstuff/Makefile
+++ b/x11/tkgoodstuff/Makefile
@@ -16,7 +16,7 @@ CATEGORIES=	x11 tk80
 #MASTER_SITES=	http://www-personal.umich.edu/~markcrim/tkgoodstuff/dists/
 DISTNAME=	${PORTNAME}${PORTVERSION}-final
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	TkGoodstuff module for fvwm2 window manager - requires XPM and fvwm2
 
 RUN_DEPENDS=	fvwm2:${PORTSDIR}/x11-wm/fvwm2
diff --git a/x11/xdialog/Makefile b/x11/xdialog/Makefile
index cd8d3f6e5c65..cf177c8f9678 100644
--- a/x11/xdialog/Makefile
+++ b/x11/xdialog/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	x11
 MASTER_SITES=	http://thgodef.nerim.net/xdialog/
 DISTNAME=	${PORTNAME:S/x/X/}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.Org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A drop in replacement for the "dialog" or "cdialog" programs
 
 USE_BZIP2=	yes