diff --git a/security/i2pd/Makefile b/security/i2pd/Makefile
index 7887b969fca6..53e06281f420 100644
--- a/security/i2pd/Makefile
+++ b/security/i2pd/Makefile
@@ -1,74 +1,74 @@
 PORTNAME=	i2pd
-DISTVERSION=	2.40.0
+DISTVERSION=	2.41.0
 CATEGORIES=	security net-p2p
 
 MAINTAINER=	driesm@FreeBSD.org
 COMMENT=	C++ implementation of I2P client
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	boost-libs>=1.72.0_5:devel/boost-libs
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USES=		cmake:insource compiler:c++11-lib ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	PurpleI2P
 USE_RC_SUBR=	${PORTNAME}
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/build
 
 SUB_FILES=	i2pd.newsyslog.conf pkg-message
 SUB_LIST=	CERTSDIR=${_CERTSDIR} \
 		GROUP="${GROUPS}" \
 		USER="${USERS}" \
 		WRITEDATADIR=${_WRITEDATADIR}
 
 USERS=		_i2pd
 GROUPS=		_i2pd
 
 PLIST_SUB=	GROUP="${GROUPS}" \
 		USER="${USERS}"
 
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=		AESNI DOCS HARDENING UPNP
 OPTIONS_DEFAULT=	AESNI
 
 AESNI_DESC=	Use AES-NI instructions set
 HARDENING_DESC=	Use hardening compiler flags
 UPNP_DESC=	Include support for UPnP client
 
 AESNI_CMAKE_BOOL=	WITH_AESNI
 
 HARDENING_CMAKE_BOOL=	WITH_HARDENING
 
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_CMAKE_BOOL=	WITH_UPNP
 
 _CERTSDIR=	${DATADIR}/certificates
 _WRITEDATADIR=	/var/db/${PORTNAME}
 
 post-patch: # fix config file
 	@${REINPLACE_CMD} -e 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/contrib/i2pd.conf
 	@${REINPLACE_CMD} -e 's|%%CERTSDIR%%|${_CERTSDIR}|g' ${WRKSRC}/contrib/i2pd.conf
 	@${REINPLACE_CMD} -e 's|/var/lib/${PORTNAME}|${_WRITEDATADIR}|g' ${WRKSRC}/contrib/i2pd.conf
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/debian/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${INSTALL_DATA} ${WRKDIR}/i2pd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d/i2pd.conf.sample
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/i2pd.conf ${STAGEDIR}${ETCDIR}/i2pd.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/contrib/tunnels.conf ${STAGEDIR}${ETCDIR}/tunnels.conf.sample
 	@(cd ${WRKSRC}/contrib/certificates && ${COPYTREE_SHARE} . ${STAGEDIR}${_CERTSDIR})
 	@${MKDIR} ${STAGEDIR}/var/run/i2pd
 	@${MKDIR} ${STAGEDIR}/var/log/i2pd
 	@${MKDIR} ${STAGEDIR}/var/db/i2pd
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/tunnels.d
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/i2pd/distinfo b/security/i2pd/distinfo
index 7a49f86a8310..ad796f9e8b16 100644
--- a/security/i2pd/distinfo
+++ b/security/i2pd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1638819224
-SHA256 (PurpleI2P-i2pd-2.40.0_GH0.tar.gz) = 4443f484ad40753e892170a26c8ee8126e8338bf416d04eab0c55c1c94a4e193
-SIZE (PurpleI2P-i2pd-2.40.0_GH0.tar.gz) = 587626
+TIMESTAMP = 1645476271
+SHA256 (PurpleI2P-i2pd-2.41.0_GH0.tar.gz) = 7b333cd26670903ef0672cf87aa9f895814ce2bbef2e587e69d66ad9427664e6
+SIZE (PurpleI2P-i2pd-2.41.0_GH0.tar.gz) = 594453
diff --git a/security/i2pd/files/patch-libi2pd__client_BOB.cpp b/security/i2pd/files/patch-libi2pd__client_BOB.cpp
deleted file mode 100644
index 6634473bf559..000000000000
--- a/security/i2pd/files/patch-libi2pd__client_BOB.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- libi2pd_client/BOB.cpp.orig	2019-06-07 14:25:55 UTC
-+++ libi2pd_client/BOB.cpp
-@@ -4,6 +4,8 @@
- #include "util.h"
- #include "BOB.h"
- 
-+#undef isset  // Prevent clash with isset macro from param.h
-+
- namespace i2p
- {
- namespace client
diff --git a/security/i2pd/pkg-plist b/security/i2pd/pkg-plist
index d59f40b28f7f..73b55d62b21b 100644
--- a/security/i2pd/pkg-plist
+++ b/security/i2pd/pkg-plist
@@ -1,28 +1,29 @@
 bin/i2pd
 @sample %%ETCDIR%%/i2pd.conf.sample
 @sample %%ETCDIR%%/tunnels.conf.sample
 @sample etc/newsyslog.conf.d/i2pd.conf.sample
 lib/libi2pd.a
 lib/libi2pdclient.a
 lib/libi2pdlang.a
 man/man1/i2pd.1.gz
 %%DATADIR%%/certificates/family/gostcoin.crt
 %%DATADIR%%/certificates/family/i2p-dev.crt
 %%DATADIR%%/certificates/family/i2pd-dev.crt
 %%DATADIR%%/certificates/family/mca2-i2p.crt
 %%DATADIR%%/certificates/family/volatile.crt
 %%DATADIR%%/certificates/reseed/acetone_at_mail.i2p.crt
 %%DATADIR%%/certificates/reseed/creativecowpat_at_mail.i2p.crt
-%%DATADIR%%/certificates/reseed/echelon_at_mail.i2p.crt
+%%DATADIR%%/certificates/reseed/echelon3_at_mail.i2p.crt
 %%DATADIR%%/certificates/reseed/hankhill19580_at_gmail.com.crt
+%%DATADIR%%/certificates/reseed/hiduser0_at_mail.i2p.crt
 %%DATADIR%%/certificates/reseed/hottuna_at_mail.i2p.crt
 %%DATADIR%%/certificates/reseed/igor_at_novg.net.crt
 %%DATADIR%%/certificates/reseed/lazygravy_at_mail.i2p.crt
 %%DATADIR%%/certificates/reseed/orignal_at_mail.i2p.crt
 %%DATADIR%%/certificates/reseed/r4sas-reseed_at_mail.i2p.crt
 %%DATADIR%%/certificates/reseed/rambler_at_mail.i2p.crt
 %%DATADIR%%/certificates/reseed/reseed_at_diva.exchange.crt
 @dir %%ETCDIR%%/tunnels.d
 @dir(%%USER%%,%%GROUP%%,755) /var/db/i2pd
 @dir(%%USER%%,%%GROUP%%,755) /var/log/i2pd
 @dir(%%USER%%,%%GROUP%%,755) /var/run/i2pd