diff --git a/net/papaya-plugins/Makefile b/net/papaya-plugins/Makefile
index 89edcfdb25dc..5660155734ed 100644
--- a/net/papaya-plugins/Makefile
+++ b/net/papaya-plugins/Makefile
@@ -1,50 +1,50 @@
 # New ports collection makefile for:	papaya-plugins
 # Date created:		23 August 2001
 # Whom:			Edwin Groothuis <edwin@mavetju.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	papaya-plugins
 PORTVERSION=	0.90
 CATEGORIES=	net
 MASTER_SITES=	http://www.gtk-papaya.org/downloads/plugins/source/
 DISTNAME=	papaya-plugins-src-${PORTVERSION}
 
-MAINTAINER=	adam@blacktabby.org
+MAINTAINER=	adam+ports@blacktabby.org
 
 # We need the source for papaya to build the plugins.
 BUILD_DEPENDS=	${PORTSDIR}/net/papaya/work/papaya-src-${PORTVERSION}/src/h:${PORTSDIR}/net/papaya
 RUN_DEPENDS=	papaya:${PORTSDIR}/net/papaya
 
 USE_SUBMAKE=	yes
 IS_INTERACTIVE=	yes
 USE_GMAKE=	yes
 USE_GNOMELIBS=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
 MAKE_ARGS+=	CXX="${CXX}"
 
 PLIST=	${WRKSRC}/pkg-plist
 
 post-patch:
 	@${PERL} -pi -e 's,g\+\+,${CXX},g' ${WRKSRC}/Makefile.in
 	@${PERL} -pi -e 's,malloc.h,stdlib.h,' ${WRKSRC}/PythonPlugin.cpp \
 		${WRKSRC}/TurfProtocol.cpp
 	@${PERL} -pi -e 's,stdint.h,sys/types.h,' ${WRKSRC}/SpellStacker.h
 
 pre-configure:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.papaya-plugins
 	${RM} ${WRKSRC}/config.cache
 
 post-configure:
 	${LN} -fs ${PORTSDIR}/net/papaya/work/papaya-src-${PORTVERSION}/src/h ${WRKSRC}/h
 
 post-build:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/add-plugins
 
 .include <bsd.port.mk>
 
 .if exists(${WRKDIR}/Makefile.inc)
 .include "${WRKDIR}/Makefile.inc"
 .endif
diff --git a/net/papaya/Makefile b/net/papaya/Makefile
index 3566a3b14128..b3536b346307 100644
--- a/net/papaya/Makefile
+++ b/net/papaya/Makefile
@@ -1,40 +1,40 @@
 # New ports collection makefile for:	papaya
 # Date created:		23 August 2001
 # Whom:			Edwin Groothuis <edwin@mavetju.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	papaya
 PORTVERSION=	0.90
 CATEGORIES=	net
 MASTER_SITES=	http://www.gtk-papaya.org/downloads/source/
 DISTNAME=	papaya-src-${PORTVERSION}
 
-MAINTAINER=	adam@blacktabby.org
+MAINTAINER=	adam+ports@blacktabby.org
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
 WANT_GNOME=	yes
 
 .include <bsd.port.pre.mk>
 
 .if !defined(HAVE_GNOME)
 CONFIGURE_ARGS+=	--disable-gnome
 .endif
 
 CONFIGURE_ENV+=	GLIBCONFIG=${GLIB_CONFIG} GTKCONFIG=${GTK_CONFIG}
 MAKE_ARGS+=	PTHREAD_LIBS=${PTHREAD_LIBS} CXX="${CXX}"
 
 post-patch:
 	@${PERL} -pi -e "s|/usr/local|${PREFIX}|"  \
 		${WRKSRC}/src/install-system.sh
 	@${PERL} -pi -e "s|\@INSTALL\@|${INSTALL_PROGRAM}|g; \
 		s|\@INSTALL_DATA\@|${INSTALL_DATA}|g" \
 		${WRKSRC}/src/install-system.sh ${WRKSRC}/po/Makefile.in.in
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>