diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile
index 8abe82fa3735..4d8961e42c9a 100644
--- a/devel/opendht/Makefile
+++ b/devel/opendht/Makefile
@@ -1,45 +1,53 @@
 PORTNAME=	opendht
-DISTVERSION=	1.10.1
-PORTREVISION=	5
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.4.10
 CATEGORIES=	devel net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight Distributed Hash Table implementation
 WWW=		https://github.com/savoirfairelinux/opendht/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
-		msgpack-cxx>4.0.0:devel/msgpack-cxx
+		msgpack-cxx>0:devel/msgpack-cxx \
+		restinio>0:www/restinio
 LIB_DEPENDS=	libargon2.so:security/libargon2 \
+		libfmt.so:devel/libfmt \
+		libhttp_parser.so:www/http-parser \
 		libjsoncpp.so:devel/jsoncpp \
-		libmsgpackc.so:devel/msgpack-c \
 		libnettle.so:security/nettle \
 		libgnutls.so:security/gnutls
+RUN_DEPENDS=	msgpack-cxx>0:devel/msgpack-cxx
+TEST_DEPENDS=	cppunit>0:devel/cppunit
+
+USES=		cmake:testing compiler:c++17-lang pathfix pkgconfig readline
 
-USES=		cmake compiler:c++11-lib pathfix pkgconfig readline
 USE_GITHUB=	yes
 GH_ACCOUNT=	savoirfairelinux
 USE_LDCONFIG=	yes
 
+LDFLAGS+=	-lcrypto
+
 CMAKE_OFF=	OPENDHT_STATIC
+CMAKE_TESTING_ON=	OPENDHT_TESTS # tests fail w/out explanation, see https://github.com/savoirfairelinux/opendht/issues/640
 
 PLIST_SUB=	SHL3=${PORTVERSION} SHL1=${PORTVERSION:R:R}
 
 OPTIONS_DEFINE=	PROXY_SERVER PROXY_CLIENT PUSH_NOTIFICATIONS DOCS
 
 PROXY_SERVER_DESC=		Enable DHT proxy server
 PROXY_CLIENT_DESC=		Enable DHT proxy client
 PUSH_NOTIFICATIONS_DESC=	Enable push notifications support
 
 PROXY_SERVER_CMAKE_BOOL=	OPENDHT_PROXY_SERVER
 PROXY_CLIENT_CMAKE_BOOL=	OPENDHT_PROXY_CLIENT
 PUSH_NOTIFICATIONS_CMAKE_BOOL=	OPENDHT_PUSH_NOTIFICATIONS
 
 PROXY_SERVER_LIB_DEPENDS=	libjsoncpp.so:devel/jsoncpp \
 				librestbed.so:www/restbed
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/devel/opendht/distinfo b/devel/opendht/distinfo
index cbcd6cb3e1e6..0b6b28c7ebab 100644
--- a/devel/opendht/distinfo
+++ b/devel/opendht/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564859802
-SHA256 (savoirfairelinux-opendht-1.10.1_GH0.tar.gz) = c1ce3b03c028ff8c11ab2855fd51f050a2ceef33c3afea9ac54f39ab78e5aee5
-SIZE (savoirfairelinux-opendht-1.10.1_GH0.tar.gz) = 434885
+TIMESTAMP = 1667672703
+SHA256 (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 8077958fb7006612b9b9758095461d8a35316b4224184f10cef785f0ec7031fe
+SIZE (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 478467
diff --git a/devel/opendht/files/patch-CMakeLists.txt b/devel/opendht/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..3b7adfa72d00
--- /dev/null
+++ b/devel/opendht/files/patch-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2022-11-06 06:47:13 UTC
++++ CMakeLists.txt
+@@ -91,8 +91,8 @@ if (NOT MSVC)
+         endif()
+         if (OPENDHT_PROXY_OPENSSL)
+             # https://cmake.org/cmake/help/latest/module/FindOpenSSL.html
+-            pkg_search_module(OPENSSL REQUIRED openssl)
+-            if (OPENSSL_FOUND)
++            #pkg_search_module(OPENSSL REQUIRED openssl)
++            if (TRUE OR OPENSSL_FOUND)
+                 message(STATUS "Found OpenSSL ${OPENSSL_VERSION} ${OPENSSL_INCLUDE_DIRS}")
+                 include_directories(SYSTEM ${OPENSSL_INCLUDE_DIRS})
+                 link_directories (${OPENSSL_LIBRARY_DIRS})
diff --git a/devel/opendht/files/patch-include_opendht_value.h b/devel/opendht/files/patch-include_opendht_value.h
index 10cf8ad2c4cf..3322b0cb663c 100644
--- a/devel/opendht/files/patch-include_opendht_value.h
+++ b/devel/opendht/files/patch-include_opendht_value.h
@@ -1,14 +1,14 @@
---- include/opendht/value.h.orig	2016-11-12 22:38:27 UTC
+--- include/opendht/value.h.orig	2022-09-02 21:01:23 UTC
 +++ include/opendht/value.h
 @@ -26,6 +26,11 @@
  
  #include <msgpack.hpp>
  
 +#if defined(__FreeBSD__)
 +#include <sys/socket.h>
 +#include <netinet/in.h>
 +#endif
 +
  #include <string>
+ #include <string_view>
  #include <sstream>
- #include <bitset>
diff --git a/devel/opendht/files/patch-src_http.cpp b/devel/opendht/files/patch-src_http.cpp
new file mode 100644
index 000000000000..92fb836b1754
--- /dev/null
+++ b/devel/opendht/files/patch-src_http.cpp
@@ -0,0 +1,15 @@
+--- src/http.cpp.orig	2022-11-06 06:49:51 UTC
++++ src/http.cpp
+@@ -608,9 +608,9 @@ Connection::async_connect(std::vector<asio::ip::tcp::e
+             setsockopt(socket, IPPROTO_TCP, TCP_KEEPALIVE, &start, sizeof(uint32_t));
+ #else
+             // Linux based systems
+-            setsockopt(socket, SOL_TCP, TCP_KEEPIDLE, &start, sizeof(uint32_t));
+-            setsockopt(socket, SOL_TCP, TCP_KEEPINTVL, &interval, sizeof(uint32_t));
+-            setsockopt(socket, SOL_TCP, TCP_KEEPCNT, &cnt, sizeof(uint32_t));
++            setsockopt(socket, IPPROTO_TCP, TCP_KEEPIDLE, &start, sizeof(uint32_t));
++            setsockopt(socket, IPPROTO_TCP, TCP_KEEPINTVL, &interval, sizeof(uint32_t));
++            setsockopt(socket, IPPROTO_TCP, TCP_KEEPCNT, &cnt, sizeof(uint32_t));
+ #endif
+ #endif
+         }
diff --git a/devel/opendht/pkg-plist b/devel/opendht/pkg-plist
index 11c31ea14e6b..c6d1d5313c8b 100644
--- a/devel/opendht/pkg-plist
+++ b/devel/opendht/pkg-plist
@@ -1,41 +1,42 @@
 bin/dhtchat
 bin/dhtnode
 bin/dhtscanner
 include/opendht.h
 include/opendht/callbacks.h
 include/opendht/crypto.h
 include/opendht/def.h
 include/opendht/default_types.h
 include/opendht/dht.h
 include/opendht/dht_interface.h
 include/opendht/dht_proxy_client.h
 include/opendht/dht_proxy_server.h
 include/opendht/dhtrunner.h
+include/opendht/http.h
 include/opendht/indexation/pht.h
 include/opendht/infohash.h
 include/opendht/log.h
 include/opendht/log_enable.h
 include/opendht/network_engine.h
 include/opendht/network_utils.h
 include/opendht/node.h
 include/opendht/node_cache.h
 include/opendht/peer_discovery.h
 include/opendht/proxy.h
 include/opendht/rate_limiter.h
 include/opendht/rng.h
 include/opendht/routing_table.h
 include/opendht/scheduler.h
 include/opendht/securedht.h
 include/opendht/sockaddr.h
 include/opendht/thread_pool.h
 include/opendht/utils.h
 include/opendht/value.h
 include/opendht/value.h.orig
 lib/cmake/opendht/opendhtConfig-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/opendht/opendhtConfig.cmake
 lib/cmake/opendht/opendhtConfigVersion.cmake
 lib/libopendht.so
 lib/libopendht.so.%%SHL1%%
 lib/libopendht.so.%%SHL3%%
 libdata/pkgconfig/opendht.pc
 man/man1/dhtnode.1.gz
diff --git a/devel/py-opendht/Makefile b/devel/py-opendht/Makefile
index 0a5946aaec12..da378e900906 100644
--- a/devel/py-opendht/Makefile
+++ b/devel/py-opendht/Makefile
@@ -1,26 +1,28 @@
 PORTNAME=	opendht
-DISTVERSION=	1.10.1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	2.4.10
 CATEGORIES=	devel net
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Lightweight Distributed Hash Table implementation
 WWW=		https://github.com/savoirfairelinux/opendht/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/../COPYING
 
+BUILD_DEPENDS=	${LOCALBASE}/include/boost/predef/other/endian.h:devel/boost-libs
 LIB_DEPENDS=	libopendht.so:devel/opendht \
 		libgnutls.so:security/gnutls
 
-USES=		cmake compiler:c++11-lib localbase python:3.4+
+USES=		cmake compiler:c++17-lang localbase python:3.4+
 USE_GITHUB=	yes
 GH_ACCOUNT=	savoirfairelinux
-USE_PYTHON=	distutils cython autoplist
+USE_PYTHON=	distutils cython autoplist pytest
 
 WRKSRC_SUBDIR=	python
 
 post-stage:
 	@${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/opendht*.so
 
 .include <bsd.port.mk>
diff --git a/devel/py-opendht/distinfo b/devel/py-opendht/distinfo
index 721b17781f9c..14cfcdce6fc9 100644
--- a/devel/py-opendht/distinfo
+++ b/devel/py-opendht/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564859831
-SHA256 (savoirfairelinux-opendht-1.10.1_GH0.tar.gz) = c1ce3b03c028ff8c11ab2855fd51f050a2ceef33c3afea9ac54f39ab78e5aee5
-SIZE (savoirfairelinux-opendht-1.10.1_GH0.tar.gz) = 434885
+TIMESTAMP = 1667721398
+SHA256 (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 8077958fb7006612b9b9758095461d8a35316b4224184f10cef785f0ec7031fe
+SIZE (savoirfairelinux-opendht-v2.4.10_GH0.tar.gz) = 478467