diff --git a/irc/ircd-hybrid/Makefile b/irc/ircd-hybrid/Makefile
index f2268818b9a4..8c585762873e 100644
--- a/irc/ircd-hybrid/Makefile
+++ b/irc/ircd-hybrid/Makefile
@@ -1,73 +1,76 @@
 PORTNAME=	ircd-hybrid
-PORTVERSION=	8.2.41
+PORTVERSION=	8.2.42
 CATEGORIES=	irc
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	fox@FreeBSD.org
 COMMENT=	Fast irc daemon with a number of new features
 
 LICENSE=	GPLv2
 
 # :keepla because port uses lt_dlopen
 USES=		cpe gmake libtool:keepla tar:tgz
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 LIB_DEPENDS+=	libltdl.so:devel/libltdl
 
 CONFLICTS_INSTALL=	ircd-ratbox ircd-ratbox-devel
 
 USERS=		ircd
 GROUPS=		${USERS}
 
 USE_RC_SUBR=	ircd-hybrid
 SUB_FILES=	pkg-message
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=		ASSERT
 OPTIONS_RADIO=		TLS
 OPTIONS_RADIO_TLS=	GNUTLS OPENSSL WOLFSSL
 OPTIONS_DEFAULT=	OPENSSL
 OPTIONS_SUB=		yes
 
 ASSERT_CONFIGURE_ENABLE=	assert
 ASSERT_DESC=			Enable parts of the debugging code
 
 OPENSSL_DESC=	Enable openssl - allows use of CHALLENGE and encrypted links
 
 INSTALL_TARGET=	install-strip
 
 INSTALL_IGNORES=	charby* ircd-rat* ircu-*
 
 CERTSFILE=	${LOCALBASE}/share/certs/ca-root-nss.crt
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MOPENSSL}
 USES+=			ssl
 CONFIGURE_ARGS+=	--with-tls=openssl
 CONFIGURE_ENV+=		libssl_CFLAGS="-I${OPENSSLINC}" \
 			libssl_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
 .elif ${PORT_OPTIONS:MGNUTLS}
 LIB_DEPENDS+=		libgnutls.so:security/gnutls
 CONFIGURE_ARGS+=	--with-tls=gnutls
 .elif ${PORT_OPTIONS:MWOLFSSL}
 LIB_DEPENDS+=		libwolfssl.so:security/wolfssl
 CONFIGURE_ARGS+=	--with-tls=wolfssl
 .else
 CONFIGURE_ARGS+=	--with-tls=none
 .endif
 
 .if ${PORT_OPTIONS:MGNUTLS} || ${PORT_OPTIONS:MOPENSSL} || ${PORT_OPTIONS:MWOLFSSL}
 RUN_DEPENDS+=	${CERTSFILE}:security/ca_root_nss
 .endif
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/${PORTNAME}-${PORTVERSION} \
 			--localstatedir=/var/${PORTNAME} \
 			--sysconfdir=${PREFIX}/etc/${PORTNAME}
 
+post-extract:
+	@${MV} ${WRKDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+
 post-install:
 	@${MV} ${STAGEDIR}${PREFIX}/bin/mkpasswd ${STAGEDIR}${PREFIX}/bin/${PORTNAME}-mkpasswd
 
 .include <bsd.port.mk>
diff --git a/irc/ircd-hybrid/distinfo b/irc/ircd-hybrid/distinfo
index 5d807d833e28..4195b43984ae 100644
--- a/irc/ircd-hybrid/distinfo
+++ b/irc/ircd-hybrid/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659948558
-SHA256 (ircd-hybrid-8.2.41.tgz) = ce0ea69654601047bd86423ddc0023c0795570249990011eaa6c41d6372b0454
-SIZE (ircd-hybrid-8.2.41.tgz) = 1061502
+TIMESTAMP = 1662273968
+SHA256 (ircd-hybrid-8.2.42.tgz) = 692d217bfc7ea37c4e4391fb86b0a92780bc32eb144f69623349721755b81f6a
+SIZE (ircd-hybrid-8.2.42.tgz) = 2230731