diff --git a/irc/ircproxy/Makefile b/irc/ircproxy/Makefile
index e2a2428f87aa..1cf0df5f0e49 100644
--- a/irc/ircproxy/Makefile
+++ b/irc/ircproxy/Makefile
@@ -1,49 +1,47 @@
 PORTNAME=	ircproxy
 DISTVERSION=	1.3.8
+PORTREVISION=	1
 CATEGORIES=	irc
 MASTER_SITES=	https://codeberg.org/BSDforge/${PORTNAME}/archive/${DISTVERSIONFULL}${EXTRACT_SUFX}?dummy=/
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	IRC proxy/bouncer daemon
 WWW=		https://codeberg.org/BSDforge/ircproxy
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libcares.so:dns/c-ares
 
 USES=		autoreconf localbase:ldflags
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-lcrypto
 
-SUB_FILES=	pkg-deinstall
-SUB_LIST=	IRC_USR=${USERS} IRC_GRP=${GROUPS}
-
 WRKSRC=	${WRKDIR}/${PORTNAME}
 
 USERS=		ircproxyd
 GROUPS=		ircproxyd
 
 OPTIONS_DEFINE=	SSL IPV6 MEMDEBUG FDDEBUG
 OPTIONS_DEFAULT=	SSL MEMDEBUG FDDEBUG
 FDDEBUG_DESC=	Enable file descriptor debugging
 MEMDEBUG_DESC=	Enable memory debugging
 
 FDDEBUG_CONFIGURE_ENABLE=	fddebug
 IPV6_CONFIGURE_ENABLE=		ipv6
 MEMDEBUG_CONFIGURE_ENABLE=	memdebug
 SSL_USES=		ssl
 SSL_CONFIGURE_ENABLE=		ssl
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|EUSER="ircproxy"|EUSER="ircproxyd"|g; \
 		s|EGROUP="users"|EGROUP="ircproxyd"|g' ${WRKSRC}/data/${PORTNAME}d.conf
 	@${REINPLACE_CMD} -e '/gnutls/!s,SSL_library_init,OPENSSL_init_ssl,' \
 		${WRKSRC}/configure.in
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/imkpasswd ${STAGEDIR}${PREFIX}/bin/ircproxyd
 
 .include <bsd.port.post.mk>
diff --git a/irc/ircproxy/files/pkg-deinstall.in b/irc/ircproxy/files/pkg-deinstall.in
deleted file mode 100644
index 1ea52d8dba1f..000000000000
--- a/irc/ircproxy/files/pkg-deinstall.in
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh
-
-case $2 in
-    POST-DEINSTALL)
-    cat <<EOMSG
-
-Note:
-The ircproxy related user accounts and groups were not removed.
-
-To remove the %%IRC_USR%% user and the %%IRC_GRP%% group which were
-created by a default installation of this package, run:
-
-    # pw groupdel %%IRC_GRP%%
-    # pw userdel %%IRC_USR%%
-
-EOMSG
-
-PIDFILE="/var/run/ircproxyd.pid"
-
-  if [ -f $PIDFILE ] && [ -r $PIDFILE ] ; then
-    PID=`cat "$PIDFILE"`
-    ps -p "$PID" >/dev/null 2>&1
-    if [ $? -eq 0 ]; then
-      for count in 1 2 3 4 5 6 7 8 9 10; do
-        if [ $count -ge 5 ]; then
-          kill -KILL "$PID" || break
-          break
-        fi
-        kill -TERM "$PID" || break
-        sleep 2
-        ps -p "$PID" >/dev/null 2>&1
-        if [ ! $? -eq 0 ]; then
-          break;
-        fi
-      done
-    fi
-  fi
-    echo
-    ;;
-esac