diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index 666c6148e11f..bed2b3428c2a 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,82 +1,82 @@
 # Created by: Brian Somers <brian@FreeBSD.org>
 
 PORTNAME=	leafnode
-DISTVERSION=	1.11.12
+DISTVERSION=	1.12.0
 CATEGORIES=	news
 MASTER_SITES=	SF \
 		LOCAL/mandree/
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	NNTP package for offline news caching and reading
 
 LICENSE=	GPLv2+
 
-LIB_DEPENDS=	libpcre.so:devel/pcre
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 
 USES=		cpe tar:xz
 GNU_CONFIGURE=	yes
 
 CONFLICTS=	newsx-1* s-news-0*
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 # TODO: remove this auto-selection, and tell users through UPDATING to
 # move their spool to /var/spool/leafnode, and run texpire -r
 .if exists(/var/spool/news/leaf.node) && !defined(PACKAGE_BUILDING)
 LEAFNODE_SPOOLDIR?=	/var/spool/news
 .elif exists(${LOCALBASE}/var/spool/leafnode/leaf.node) && !defined(PACKAGE_BUILDING)
 LEAFNODE_SPOOLDIR?=	${LOCALBASE}/var/spool/leafnode
 .endif
 LEAFNODE_SPOOLDIR?=	/var/spool/leafnode
 PLIST_SUB+=		REALPREFIX=${PREFIX} \
 			SPOOLDIR=${LEAFNODE_SPOOLDIR}
 
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
 		--sysconfdir=${PREFIX}/etc/leafnode \
 		--with-ipv6 \
 		--with-spooldir=${LEAFNODE_SPOOLDIR}
 SUB_FILES=	pkg-deinstall pkg-install pkg-message
 SUB_LIST=	SPOOLDIR=${LEAFNODE_SPOOLDIR}
 TEST_TARGET=	check
 
 MAN1_DE=	leafnode-version.1 newsq.1
 MAN8_DE=	applyfilter.8 checkgroups.8 fetchnews.8 leafnode.8 texpire.8
 MANLANG=	"" de.ISO8859-1
 MAN1DIR_DE=	${MAN1PREFIX}/man/de.ISO8859-1/man1
 MAN8DIR_DE=	${MAN8PREFIX}/man/de.ISO8859-1/man8
 
 DOCS=		ADD-ONS ChangeLog COPYING CREDITS FAQ.txt FAQ.pdf FAQ.html \
 		INSTALL NEWS README ChangeLog.old README-FQDN README-FQDN.html \
-		README-daemontools leafnode.cron.daily leafnode-SA-2002-01.txt \
+		leafnode.cron.daily leafnode-SA-2002-01.txt \
 		leafnode-SA-2003-01.txt leafnode-SA-2004-01.txt \
 		leafnode-SA-2005-01.txt leafnode-SA-2005-02.txt KNOWNBUGS
-DOCS_DE=	INSTALL_de LIESMICH-daemontools README README_de
+DOCS_DE=	INSTALL_de README README_de
 
 .if ${PORT_OPTIONS:MDOCS}
 PORTDOCS=	*
 .endif
 
 pre-configure:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "------------------------------------------------------------------------"
 	@${ECHO_MSG} "This port will use ${LEAFNODE_SPOOLDIR} as spool directory."
 	@${ECHO_MSG} "Use LEAFNODE_SPOOLDIR=d to specify d as spool directory."
 	@${ECHO_MSG} "------------------------------------------------------------------------"
 	@${ECHO_MSG}
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/setup-daemontools.sh ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_SCRIPT} ${WRKSRC}/UNINSTALL-daemontools ${STAGEDIR}${PREFIX}/etc/leafnode/
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/german
 	cd ${WRKSRC}/doc_german && ${INSTALL_DATA} ${DOCS_DE} ${STAGEDIR}${DOCSDIR}/german
 .endif
 	${MKDIR} ${STAGEDIR}${MAN1DIR_DE} ${STAGEDIR}${MAN8DIR_DE}
 	cd ${WRKSRC}/doc_german && \
 	${INSTALL_MAN} ${MAN1_DE} ${STAGEDIR}${MAN1PREFIX}/man/de.ISO8859-1/man1 && \
 	${INSTALL_MAN} ${MAN8_DE} ${STAGEDIR}${MAN8PREFIX}/man/de.ISO8859-1/man8
 
 .include <bsd.port.post.mk>
diff --git a/news/leafnode/distinfo b/news/leafnode/distinfo
index f935ee31cd70..159c475ede76 100644
--- a/news/leafnode/distinfo
+++ b/news/leafnode/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616889404
-SHA256 (leafnode-1.11.12.tar.xz) = 0daeaebc2766f6dff04ac8bd6ccdd43168f091e876e25f07dcf1079057d32e3c
-SIZE (leafnode-1.11.12.tar.xz) = 454800
+TIMESTAMP = 1653605287
+SHA256 (leafnode-1.12.0.tar.xz) = 8310b78006a2088b82dcf9a6b18504ec4f7279bd1047af58d3dac5aaf607ce58
+SIZE (leafnode-1.12.0.tar.xz) = 464572
diff --git a/news/leafnode/pkg-plist b/news/leafnode/pkg-plist
index 1104ec4a9fc4..ee150a972cc9 100644
--- a/news/leafnode/pkg-plist
+++ b/news/leafnode/pkg-plist
@@ -1,41 +1,36 @@
 bin/leafnode-version
 bin/newsq
 %%ETCDIR%%/config.example
 %%ETCDIR%%/filters.example
-%%ETCDIR%%/nntp.rules.dist
-%%ETCDIR%%/run.tcpd.dist
-%%ETCDIR%%/run.tcpserver.dist
-%%ETCDIR%%/Makefile.dist
 %%ETCDIR%%/UNINSTALL-daemontools
 man/man1/leafnode-version.1.gz
 man/man1/newsq.1.gz
 man/man8/applyfilter.8.gz
 man/man8/checkgroups.8.gz
 man/man8/fetchnews.8.gz
 man/man8/leafnode.8.gz
 man/man8/texpire.8.gz
 man/de.ISO8859-1/man1/leafnode-version.1.gz
 man/de.ISO8859-1/man1/newsq.1.gz
 man/de.ISO8859-1/man8/applyfilter.8.gz
 man/de.ISO8859-1/man8/checkgroups.8.gz
 man/de.ISO8859-1/man8/fetchnews.8.gz
 man/de.ISO8859-1/man8/leafnode.8.gz
 man/de.ISO8859-1/man8/texpire.8.gz
 sbin/leafnode
 sbin/fetchnews
 sbin/texpire
 sbin/checkgroups
 sbin/applyfilter
-sbin/setup-daemontools.sh
 @dir %%ETCDIR%%
 @comment only remove these when empty:
 @comment we don't want to kill the news spool across updates
 @postunexec rm -f %%SPOOLDIR%%/leaf.node/lock.file
 @dir %%SPOOLDIR%%/failed.postings
 @dir %%SPOOLDIR%%/interesting.groups
 @dir %%SPOOLDIR%%/leaf.node
 @dir %%SPOOLDIR%%/message.id
 @dir %%SPOOLDIR%%/out.going
 @dir %%SPOOLDIR%%/temp.files
 @dir %%SPOOLDIR%%
 @postunexec if test -d "%%SPOOLDIR%%" || test -d "%D/etc/leafnode" ; then echo ; echo "==============================================================================" ; echo "If you want to remove leafnode for good, delete spool and configuration:" ; echo "type: rm -rf %D/etc/leafnode %%SPOOLDIR%%" ; echo "==============================================================================" ; fi