diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index a1cbe065b29e..1d3ade5b0a66 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	couchdb/releases/${PORTVERSION}
 DISTNAME=	apache-couchdb-${PORTVERSION}
 
-MAINTAINER=	till@php.net
+MAINTAINER=	adams-ports@ateamsystems.com
 COMMENT=	A document database server, accessible via a RESTful JSON API
 
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu \
diff --git a/net/pecl-yaz/Makefile b/net/pecl-yaz/Makefile
index 06cda67b3b38..af08d2ad2c8d 100644
--- a/net/pecl-yaz/Makefile
+++ b/net/pecl-yaz/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	pecl-yaz
-# Date created:			9 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
+# Created by: Alex Dupre <ale@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	yaz
 PORTVERSION=	1.0.14
@@ -14,7 +10,7 @@ PKGNAMEPREFIX=	pecl-
 EXTRACT_SUFX=	.tgz
 DIST_SUBDIR=	PECL
 
-MAINTAINER=	till@php.net
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A PECL extension that implements a Z39.50 client
 
 LIB_DEPENDS=	yaz.4:${PORTSDIR}/net/yaz