--- multimedia/handbrake/Makefile.orig	Tue Mar 22 09:41:10 2005
+++ multimedia/handbrake/Makefile	Tue May 31 12:28:06 2005
@@ -12,7 +12,7 @@
 MASTER_SITES=	http://people.via.ecp.fr/~titer/handbrake/
 DISTNAME=	HandBrake-${PORTVERSION}-src
 
-MAINTAINER=	andy@fud.org.nz
+MAINTAINER=	thompsa@freebsd.org
 COMMENT=	A DVD to MPEG-4 ripper and encoder
 
 BUILD_DEPENDS=	jam:${PORTSDIR}/devel/jam \
--- net/freeradius/Makefile.orig	Thu Apr 21 09:03:35 2005
+++ net/freeradius/Makefile		Tue May 31 12:28:35 2005
@@ -12,7 +12,7 @@
 MASTER_SITES=	ftp://ftp.freeradius.org/pub/radius/ \
 		ftp://ftp.Awfulhak.org/pub/radius/
 
-MAINTAINER=	andy@fud.org.nz
+MAINTAINER=	thompsa@freebsd.org
 COMMENT=	A free RADIUS server implementation
 
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
--- net/pfflowd/Makefile.orig	Thu Nov 11 10:06:49 2004
+++ net/pfflowd/Makefile May 31 12:28:25 2005
@@ -10,7 +10,7 @@
 CATEGORIES=	net
 MASTER_SITES=	http://www.mindrot.org/files/pfflowd/
 
-MAINTAINER=	andy@fud.org.nz
+MAINTAINER=	thompsa@freebsd.org
 COMMENT=	Convert pfsync states to NetFlow datagrams
 
 MAN8=		pfflowd.8
--- net-mgmt/pads/Makefile.orig	Mon Feb 21 20:43:33 2005
+++ net-mgmt/pads/Makefile	Tue May 31 12:28:15 2005
@@ -11,7 +11,7 @@
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	passive
 
-MAINTAINER=	andy@fud.org.nz
+MAINTAINER=	thompsa@freebsd.org
 COMMENT=	Passively detect network assets
 
 LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
--- print/lyx/Makefile.orig	Fri Mar 11 09:40:15 2005
+++ print/lyx/Makefile		Tue May 31 12:28:10 2005
@@ -13,7 +13,7 @@
 		http://www-ftp.lip6.fr/ftp/pub/lyx/stable/ \
 		ftp://gd.tuwien.ac.at/publishing/tex/lyx/stable/
 
-MAINTAINER=	andy@fud.org.nz
+MAINTAINER=	thompsa@freebsd.org
 COMMENT=	Document processor interfaced with LaTeX (nearly WYSIWYG)
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4 \
--- security/pamtester/Makefile.orig	Sun May 29 21:48:19 2005
+++ security/pamtester/Makefile		Tue May 31 12:28:19 2005
@@ -11,7 +11,7 @@
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=		andy@fud.org.nz
+MAINTAINER=		thompsa@freebsd.org
 COMMENT=		A command line pam authentication tester
 
 MAN1=			pamtester.1