diff --git a/devel/Makefile b/devel/Makefile
index a2f7f33bc4b6..69a19a9387c1 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -1619,6 +1619,7 @@
     SUBDIR += open-usp-tukubai
     SUBDIR += opencl
     SUBDIR += opencvs
+    SUBDIR += opendht
     SUBDIR += opengrok
     SUBDIR += openmp
     SUBDIR += openocd
diff --git a/devel/opendht/Makefile b/devel/opendht/Makefile
new file mode 100644
index 000000000000..5f91d293b1c2
--- /dev/null
+++ b/devel/opendht/Makefile
@@ -0,0 +1,35 @@
+# Created by: Yuri Victorovich <yuri@rawbw.com>
+# $FreeBSD$
+
+PORTNAME=	opendht
+PORTVERSION=	0.5.2
+CATEGORIES=	devel net
+
+MAINTAINER=	yuri@rawbw.com
+COMMENT=	Lightweight Distributed Hash Table implementation
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libmsgpackc.so:devel/msgpack \
+		libnettle.so:security/nettle \
+		libgnutls.so:security/gnutls \
+		libreadline.so:devel/readline
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	savoirfairelinux
+
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--disable-python
+USE_LDCONFIG=	yes
+
+USES=		autoreconf compiler:c++11-lib libtool pkgconfig
+CFLAGS+=	-I${LOCALBASE}/include
+CXXFLAGS+=	-I${LOCALBASE}/include
+
+post-stage:
+	@${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/opendht.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
+	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/pkgconfig
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopendht.so.0.0.0
+
+.include <bsd.port.mk>
diff --git a/devel/opendht/distinfo b/devel/opendht/distinfo
new file mode 100644
index 000000000000..498af995661e
--- /dev/null
+++ b/devel/opendht/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1464414803
+SHA256 (savoirfairelinux-opendht-0.5.2_GH0.tar.gz) = 4fb8c80fed8abd4861b16144a0c50853717add59d5491b779590fa81e72784b8
+SIZE (savoirfairelinux-opendht-0.5.2_GH0.tar.gz) = 120460
diff --git a/devel/opendht/files/patch-include_opendht_value.h b/devel/opendht/files/patch-include_opendht_value.h
new file mode 100644
index 000000000000..bf13e441530d
--- /dev/null
+++ b/devel/opendht/files/patch-include_opendht_value.h
@@ -0,0 +1,14 @@
+--- include/opendht/value.h.orig	2016-05-13 00:23:45 UTC
++++ include/opendht/value.h
+@@ -26,6 +26,11 @@
+ 
+ #include <msgpack.hpp>
+ 
++#if defined(__FreeBSD__)
++#include <sys/socket.h>
++#include <netinet/in.h>
++#endif
++
+ #ifndef _WIN32
+ #include <netinet/in.h>
+ #include <netdb.h>
diff --git a/devel/opendht/pkg-descr b/devel/opendht/pkg-descr
new file mode 100644
index 000000000000..7611f146b8df
--- /dev/null
+++ b/devel/opendht/pkg-descr
@@ -0,0 +1,13 @@
+A lightweight C++11 Distributed Hash Table implementation originally based on
+https://github.com/jech/dht by Juliusz Chroboczek.
+
+* Light and fast C++11 Kademlia DHT library.
+* Distributed shared key->value data-store
+* Clean and powerfull distributed map API with storage of arbitrary binary
+  values of up to 56 KB.
+* Optional public key cryptography layer providing data signature and
+  encryption (using GnuTLS).
+* IPv4 and IPv6 support.
+* Python binding.
+
+WWW: https://github.com/savoirfairelinux/opendht/
diff --git a/devel/opendht/pkg-plist b/devel/opendht/pkg-plist
new file mode 100644
index 000000000000..d3eda1104011
--- /dev/null
+++ b/devel/opendht/pkg-plist
@@ -0,0 +1,18 @@
+bin/dhtchat
+bin/dhtnode
+bin/dhtscanner
+include/opendht.h
+include/opendht/crypto.h
+include/opendht/default_types.h
+include/opendht/dht.h
+include/opendht/dhtrunner.h
+include/opendht/infohash.h
+include/opendht/rng.h
+include/opendht/securedht.h
+include/opendht/utils.h
+include/opendht/value.h
+lib/libopendht.a
+lib/libopendht.so
+lib/libopendht.so.0
+lib/libopendht.so.0.0.0
+libdata/pkgconfig/opendht.pc