diff --git a/net/gitup/Makefile b/net/gitup/Makefile
index 2bf7c85c099f..82a8f2096123 100644
--- a/net/gitup/Makefile
+++ b/net/gitup/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	gitup
 DISTVERSION=	0.98-3
 DISTVERSIONSUFFIX=	-g50f1e8c
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Minimalist, dependency-free program to clone/pull git repositories
 WWW=		https://github.com/johnmehr/gitup
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		ssl
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	johnmehr
 
 MAKE_ENV+=	CONFIG_FILE_PATH=${LOCALBASE}/etc/gitup.conf
 
+SUB_FILES=	pkg-message
+PLIST_FILES=	bin/gitup \
+		etc/gitup.conf.sample \
+		share/man/man1/gitup.1.gz \
+		share/man/man5/gitup.conf.5.gz
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|stable\/12|stable\/${OSREL:R}| ; \
-		s|releng\/11.4|releng\/${OSREL}|' \
-		${WRKSRC}/gitup.conf
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/gitup.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/gitup.conf.5 \
 		${STAGEDIR}${PREFIX}/share/man/man5
 	${INSTALL_DATA} ${WRKSRC}/gitup.conf \
 		${STAGEDIR}${PREFIX}/etc/gitup.conf.sample
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/gitup/files/pkg-message.in b/net/gitup/files/pkg-message.in
new file mode 100644
index 000000000000..cab4b53267d1
--- /dev/null
+++ b/net/gitup/files/pkg-message.in
@@ -0,0 +1,12 @@
+[
+{ type: install
+  message: <<EOD
+To use gitup,
+
+%%PREFIX%%/etc/gitup.conf
+
+must be created. Refer to gitup.conf(5) for further details and/or follow
+%%PREFIX%%/etc/gitup.conf.sample as an example.
+EOD
+}
+]
diff --git a/net/gitup/pkg-plist b/net/gitup/pkg-plist
deleted file mode 100644
index 44526235ecd1..000000000000
--- a/net/gitup/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/gitup
-share/man/man1/gitup.1.gz
-share/man/man5/gitup.conf.5.gz
-@sample etc/gitup.conf.sample
diff --git a/net/gitup/pkg-post-install b/net/gitup/pkg-post-install
new file mode 100644
index 000000000000..ad57f46fb19b
--- /dev/null
+++ b/net/gitup/pkg-post-install
@@ -0,0 +1,5 @@
+osrel=$(${PKG_ROOTDIR}/bin/freebsd-version -u)
+releng=${osrel%%-*}
+stable=${osrel%%.*}
+
+sed -i '' -E -e "s,stable/[0-9]+,stable/${stable}," -e "s,releng/[0-9].+,releng/${releng}," ${PKG_PREFIX}/etc/gitup.conf.sample