diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9a7be3ba1945..cd23241c4ef4 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,3 +1,9 @@
-FreeBSD does not currently accept pull requests. This is a read-only mirror from SVN.
+# FreeBSD Ports Collection Contribution Guidelines
 
-Please see the [Porter's Handbook](https://docs.freebsd.org/en/books/porters-handbook/) section on [Submitting patches](https://docs.freebsd.org/en/books/porters-handbook/quick-porting/#porting-submitting).
+Contributions may be submitted to the FreeBSD Ports Collection via one of three methods:
+
+- Attachments to [Bugzilla tickets](https://bugs.freebsd.org) are preferred, as this notifies existing maintainers.
+- Code reviews on [Phabricator](https://reviews.freebsd.org/differential) are accepted by some maintainers.
+- GitHub Pull Requests are an experimental feature and should expect additional delay.
+
+To learn more about contributing to the FreeBSD Ports Collection, please see the [Porter's Handbook](https://docs.freebsd.org/en/books/porters-handbook/) section on [Submitting patches](https://docs.freebsd.org/en/books/porters-handbook/quick-porting/#porting-submitting).
diff --git a/games/xteddy/Makefile b/games/xteddy/Makefile
index eb697591a16a..9ca1bf58d102 100644
--- a/games/xteddy/Makefile
+++ b/games/xteddy/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	xteddy
 PORTVERSION=	2.2
 PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	http://webstaff.itn.liu.se/~stegu/xteddy/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	0mp@FreeBSD.org
 COMMENT=	Cuddlesome teddy for the X desktop
 WWW=		http://webstaff.itn.liu.se/~stegu/xteddy/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2
 
 USES=		localbase pkgconfig
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 
 LDFLAGS+=	-lXext
 
 PLIST_FILES=	bin/xteddy bin/xteddy_test bin/xtoys \
 		share/man/man6/xteddy.6.gz \
 		%%DATADIR%%/teddy.png %%DATADIR%%/xalex.png \
 		%%DATADIR%%/xbobo.png %%DATADIR%%/xbrummi.png \
 		%%DATADIR%%/xcherubino.png %%DATADIR%%/xduck.png \
 		%%DATADIR%%/xhedgehog.png %%DATADIR%%/xklitze.png \
 		%%DATADIR%%/xnamu.png %%DATADIR%%/xorca.png \
 		%%DATADIR%%/xpenguin.png %%DATADIR%%/xpuppy.png \
 		%%DATADIR%%/xruessel.png %%DATADIR%%/xteddy.png \
 		%%DATADIR%%/xtrouble.png %%DATADIR%%/xtuxxy.png
 
 post-patch:
 .for f in configure xteddy.c
 	@${REINPLACE_CMD} -e \
 		's|/usr/share/xteddy|${DATADIR}|' ${WRKSRC}/${f}
 .endfor
 .for f in xteddy_test xtoys
 	@${REINPLACE_CMD} -e \
 		's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/${f}
 .endfor
 
 .include <bsd.port.mk>