diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile
index 3c9208d13712..afac5c757496 100644
--- a/devel/opendht/Makefile
+++ b/devel/opendht/Makefile
@@ -1,52 +1,53 @@
 PORTNAME=	opendht
 DISTVERSIONPREFIX=	v
 DISTVERSION=	3.1.7
+PORTREVISION=	1
 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=	${LOCALBASE}/include/asio.hpp:net/asio \
 		boost-libs>0:devel/boost-libs \
 		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 \
 		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 localbase ncurses pathfix pkgconfig readline ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	savoirfairelinux
 USE_LDCONFIG=	yes
 
 LDFLAGS+=	-lcrypto
 
 CMAKE_OFF=	OPENDHT_STATIC BUILD_TESTING
 CMAKE_TESTING_ON=	BUILD_TESTING # tests fail w/out explanation, see https://github.com/savoirfairelinux/opendht/issues/640, https://github.com/savoirfairelinux/opendht/issues/658
 
 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/files/patch-doc_CMakeLists.txt b/devel/opendht/files/patch-doc_CMakeLists.txt
deleted file mode 100644
index 09df42088d0e..000000000000
--- a/devel/opendht/files/patch-doc_CMakeLists.txt
+++ /dev/null
@@ -1,9 +0,0 @@
---- doc/CMakeLists.txt.orig	2018-03-15 06:08:59 UTC
-+++ doc/CMakeLists.txt
-@@ -1,5 +1,5 @@
- if (OPENDHT_TOOLS)
--	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dhtnode.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
-+	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dhtnode.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/man/man1)
- endif ()
- 
- if (OPENDHT_DOCUMENTATION)
diff --git a/devel/opendht/pkg-plist b/devel/opendht/pkg-plist
index 05b0490f68e1..1d8bfd655f9a 100644
--- a/devel/opendht/pkg-plist
+++ b/devel/opendht/pkg-plist
@@ -1,44 +1,44 @@
 bin/dhtchat
 bin/dhtnode
 bin/dhtscanner
 include/opendht.h
 include/opendht/callbacks.h
 include/opendht/crypto.h
 include/opendht/crypto/secure_vector.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/logger.h
 include/opendht/network_engine.h
 include/opendht/network_utils.h
 include/opendht/node.h
 include/opendht/node_cache.h
 include/opendht/node_export.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.3
 lib/libopendht.so.3.1.7
 libdata/pkgconfig/opendht.pc
-man/man1/dhtnode.1.gz
+share/man/man1/dhtnode.1.gz