Index: ports-mgmt/porttools/Makefile
===================================================================
--- ports-mgmt/porttools/Makefile
+++ ports-mgmt/porttools/Makefile
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	porttools
-PORTVERSION=	1.03.1
+PORTVERSION=	1.04
 CATEGORIES=	ports-mgmt
 
-MAINTAINER=	xmj@FreeBSD.org
+MAINTAINER=	skreuzer@FreeBSD.org
 COMMENT=	Tools for testing and submitting port updates and new ports
 
 LICENSE=	BSD2CLAUSE
@@ -16,20 +16,15 @@
 		svn:${PORTSDIR}/devel/subversion
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	xmj
-GH_COMMIT=	a733b7c
+GH_ACCOUNT=	skreuzer
+GH_COMMIT=	ad515ca
 GH_TAGNAME=	${GH_COMMIT}
 
 # Make the version information of porttools itself
 # available for inclusion in the PRs generated by it.
 MAKE_ENV+=	DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" PORTVERSION="${PORTVERSION}"
 
-OPTIONS_DEFINE=		DOCS NEWFILE
-OPTIONS_DEFAULT=	NEWFILE
-
-NEWFILE_DESC=	Enable newfile support
-
-NEWFILE_RUN_DEPENDS=	newfile:${PORTSDIR}/devel/newfile
+OPTIONS_DEFINE=		DOCS
 
 DOCS_INSTALL_TARGET=	 install install-docs
 
Index: ports-mgmt/porttools/distinfo
===================================================================
--- ports-mgmt/porttools/distinfo
+++ ports-mgmt/porttools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (porttools-1.03.1.tar.gz) = 3fe6245e91284f56aa5b1c755980b2373815da9c81a697987eb5da4cc803db8e
-SIZE (porttools-1.03.1.tar.gz) = 21123
+SHA256 (porttools-1.04.tar.gz) = 7a44e516f1d3815ffbd0e36ab18702a057725fb26d8f68da6a22d613b9f454e7
+SIZE (porttools-1.04.tar.gz) = 22181
Index: ports-mgmt/porttools/pkg-plist
===================================================================
--- ports-mgmt/porttools/pkg-plist
+++ ports-mgmt/porttools/pkg-plist
@@ -1,6 +1,10 @@
 bin/port
 man/man1/port.1.gz
 man/man5/porttools.5.gz
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/THANKS
 %%DATADIR%%/cmd_commit
 %%DATADIR%%/cmd_create
 %%DATADIR%%/cmd_diff
@@ -12,8 +16,11 @@
 %%DATADIR%%/cmd_submit
 %%DATADIR%%/cmd_test
 %%DATADIR%%/cmd_upgrade
+%%DATADIR%%/tmpl/R-cran/Makefile.tmpl
+%%DATADIR%%/tmpl/common/pkg-descr.tmpl
+%%DATADIR%%/tmpl/common/pkg-plist.tmpl
+%%DATADIR%%/tmpl/default/Makefile.tmpl
+%%DATADIR%%/tmpl/p5/Makefile.tmpl
+%%DATADIR%%/tmpl/pear/Makefile.tmpl
+%%DATADIR%%/tmpl/py/Makefile.tmpl
 %%DATADIR%%/util_diff
-%%PORTDOCS%%%%DOCSDIR%%/LICENSE
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/THANKS