diff --git a/security/i2pd/Makefile b/security/i2pd/Makefile
index abe8d5e6c6d2..8daef6dd4bba 100644
--- a/security/i2pd/Makefile
+++ b/security/i2pd/Makefile
@@ -1,58 +1,58 @@
 # Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	i2pd
-PORTVERSION=	2.25.0
+PORTVERSION=	2.26.0
 CATEGORIES=	security net-p2p
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	C++ implementation of I2P client
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	PurpleI2P
 
 USES=		cmake:insource compiler:c++11-lib ssl
 CMAKE_ARGS=	-DWITH_GUI=OFF
 CMAKE_SOURCE_PATH=	${WRKSRC}/build
 USE_RC_SUBR=	${PORTNAME}
 
 PORTDOCS=	*
 
 USERS=		_i2pd
 GROUPS=		_i2pd
 
 PLIST_SUB=	USER="${USERS}" GROUP="${GROUPS}"
 SUB_LIST=	USER="${USERS}" GROUP="${GROUPS}"
 SUB_FILES=	i2pd.newsyslog.conf
 
 OPTIONS_DEFINE=	AESNI AVX UPNP DOCS HARDENING
 
 AESNI_DESC=		Use AES-NI instructions set
 AESNI_CMAKE_BOOL=	WITH_AESNI
 AVX_DESC=		Use AVX instructions
 AVX_CMAKE_BOOL=		WITH_AVX
 UPNP_DESC=		Include support for UPnP client
 UPNP_CMAKE_BOOL=	WITH_UPNP
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 HARDENING_CMAKE_BOOL=	WITH_HARDENING
 HARDENING_DESC=		Use hardening compiler flags
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${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
 	@${MKDIR} ${STAGEDIR}/var/run/i2pd
 	@${MKDIR} ${STAGEDIR}/var/log/i2pd
 	@${MKDIR} ${STAGEDIR}/var/db/i2pd
 
 do-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 e953375d54a9..87be3a466ce5 100644
--- a/security/i2pd/distinfo
+++ b/security/i2pd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1559570036
-SHA256 (PurpleI2P-i2pd-2.25.0_GH0.tar.gz) = 80486b51abbf082ca427c95a298f037a28504eb3c6c788a700273de34ae1bd6b
-SIZE (PurpleI2P-i2pd-2.25.0_GH0.tar.gz) = 1068786
+TIMESTAMP = 1560183475
+SHA256 (PurpleI2P-i2pd-2.26.0_GH0.tar.gz) = 2ae18978c8796bb6b45bc8cfe4e1f25377e0cfc9fcf9f46054b09dc3384eef63
+SIZE (PurpleI2P-i2pd-2.26.0_GH0.tar.gz) = 1073024
diff --git a/security/i2pd/files/patch-libi2pd__client_BOB.cpp b/security/i2pd/files/patch-libi2pd__client_BOB.cpp
new file mode 100644
index 000000000000..6634473bf559
--- /dev/null
+++ b/security/i2pd/files/patch-libi2pd__client_BOB.cpp
@@ -0,0 +1,11 @@
+--- 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