diff --git a/dns/powerdns-recursor/Makefile b/dns/powerdns-recursor/Makefile
index 4070a7704a8a..28ded2035f22 100644
--- a/dns/powerdns-recursor/Makefile
+++ b/dns/powerdns-recursor/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	recursor
-DISTVERSION=	4.7.4
+DISTVERSION=	4.8.0
 CATEGORIES=	dns
 MASTER_SITES=	http://downloads.powerdns.com/releases/
 PKGNAMEPREFIX=	powerdns-
 DISTNAME=	pdns-${PORTNAME}-${DISTVERSION}
 
 MAINTAINER=	tremere@cainites.net
 COMMENT=	Advanced DNS recursor
 WWW=		https://www.PowerDNS.com/recursor.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BROKEN_armv6=	fails to compile: use of overloaded operator << is ambiguous
 BROKEN_armv7=	fails to compile: use of overloaded operator << is ambiguous
 BROKEN_FreeBSD_12_powerpc64=	fails to compile: Assembler messages: unaligned opcodes detected in executable segment
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	archs with 32-bits time_t are no longer supported by upstream
 
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
 LIB_DEPENDS=	libboost_context.so:devel/boost-libs
 
 USES=		autoreconf compiler:c++11-lib cpe gmake libtool \
 		localbase:ldflags pkgconfig ssl tar:bzip2
 
 CPE_VENDOR=	powerdns
 USE_RC_SUBR=	pdns-recursor
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc/pdns \
 		--with-libsodium=no \
 		--without-net-snmp \
 		--without-systemd
 
 SUB_FILES=	pkg-message
 
 USERS=		pdns_recursor
 GROUPS=		pdns
 
 OPTIONS_DEFINE=		DNSTAP
 OPTIONS_DEFAULT=	LUA
 OPTIONS_SINGLE=		EXTLUA
 OPTIONS_SINGLE_EXTLUA=	LUA LUAJIT
 
 DNSTAP_DESC=	dnstap support (see dnstap.info)
 LUAJIT_DESC=	Use luajit
 LUA_DESC=	Use lang/lua
 
 DNSTAP_LIB_DEPENDS=		libfstrm.so:devel/fstrm
 DNSTAP_CONFIGURE_ENABLE=	dnstap
 
 LUAJIT_USES=		luajit
 LUAJIT_CONFIGURE_ON=	--with-lua=luajit
 
 LUA_USES=	lua
 
 post-install:
 	@${MKDIR} ${STAGEDIR}/var/run/pdns-recursor
 
 .include <bsd.port.mk>
diff --git a/dns/powerdns-recursor/distinfo b/dns/powerdns-recursor/distinfo
index 6d7b85381a2b..1b009931ff81 100644
--- a/dns/powerdns-recursor/distinfo
+++ b/dns/powerdns-recursor/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1669382845
-SHA256 (pdns-recursor-4.7.4.tar.bz2) = 17b5c7c881e3f400bb3b527dd866e5cf2cd62d5d33566b1b70b58c608d9968d5
-SIZE (pdns-recursor-4.7.4.tar.bz2) = 1609031
+TIMESTAMP = 1670850932
+SHA256 (pdns-recursor-4.8.0.tar.bz2) = ccb9017a1a788e95e948e7b240ef8db53ae8a507b915f260188ef343f7f68bdc
+SIZE (pdns-recursor-4.8.0.tar.bz2) = 1530308
diff --git a/dns/powerdns-recursor/files/patch-pdns__recursor.cc b/dns/powerdns-recursor/files/patch-pdns__recursor.cc
new file mode 100644
index 000000000000..adf053b5dc48
--- /dev/null
+++ b/dns/powerdns-recursor/files/patch-pdns__recursor.cc
@@ -0,0 +1,11 @@
+--- pdns_recursor.cc.orig	2022-12-09 10:46:42 UTC
++++ pdns_recursor.cc
+@@ -2517,7 +2517,7 @@ void makeUDPServerSockets(deferredAdd_t& deferredAdds,
+     if (g_reusePort) {
+ #if defined(SO_REUSEPORT_LB)
+       try {
+-        SSetsockopt(fd, SOL_SOCKET, SO_REUSEPORT_LB, 1);
++        SSetsockopt(socketFd, SOL_SOCKET, SO_REUSEPORT_LB, 1);
+       }
+       catch (const std::exception& e) {
+         throw PDNSException(std::string("SO_REUSEPORT_LB: ") + e.what());
diff --git a/dns/powerdns-recursor/files/patch-rec-main.cc b/dns/powerdns-recursor/files/patch-rec-main.cc
index c6e7894e1e9a..d233469daf42 100644
--- a/dns/powerdns-recursor/files/patch-rec-main.cc
+++ b/dns/powerdns-recursor/files/patch-rec-main.cc
@@ -1,18 +1,18 @@
---- rec-main.cc.orig	2022-05-29 14:07:40 UTC
+--- rec-main.cc.orig	2022-12-09 10:46:42 UTC
 +++ rec-main.cc
-@@ -2309,13 +2309,13 @@ int main(int argc, char** argv)
+@@ -2609,13 +2609,13 @@ int main(int argc, char** argv)
                  SYSTEMD_SETID_MSG
  #endif
                  )
 -      = "";
 +      = "pdns";
      ::arg().set("setuid", "If set, change user id to this uid for more security"
  #ifdef HAVE_SYSTEMD
                  SYSTEMD_SETID_MSG
  #endif
                  )
 -      = "";
 +      = "pdns_recursor";
      ::arg().set("network-timeout", "Wait this number of milliseconds for network i/o") = "1500";
      ::arg().set("threads", "Launch this number of threads") = "2";
      ::arg().set("distributor-threads", "Launch this number of distributor threads, distributing queries to other threads") = "0";
diff --git a/dns/powerdns-recursor/files/patch-rec-tcp.cc b/dns/powerdns-recursor/files/patch-rec-tcp.cc
new file mode 100644
index 000000000000..6af006070116
--- /dev/null
+++ b/dns/powerdns-recursor/files/patch-rec-tcp.cc
@@ -0,0 +1,11 @@
+--- rec-tcp.cc.orig	2022-12-09 10:46:42 UTC
++++ rec-tcp.cc
+@@ -1067,7 +1067,7 @@ void makeTCPServerSockets(deferredAdd_t& deferredAdds,
+     if (g_reusePort) {
+ #if defined(SO_REUSEPORT_LB)
+       try {
+-        SSetsockopt(fd, SOL_SOCKET, SO_REUSEPORT_LB, 1);
++        SSetsockopt(socketFd, SOL_SOCKET, SO_REUSEPORT_LB, 1);
+       }
+       catch (const std::exception& e) {
+         throw PDNSException(std::string("SO_REUSEPORT_LB: ") + e.what());