diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18cd7322..171a1c7d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,9 @@ option (OPENDHT_SYSTEMD "Install systemd module" OFF)
 option (OPENDHT_ARGON2 "Use included argon2 sources" OFF)
 option (OPENDHT_LTO "Build with LTO" OFF)
 option (OPENDHT_SANITIZE "Build with address sanitizer and stack protector" OFF)
+option (OPENDHT_PROXY_SERVER "Enable DHT proxy server, use Restbed and jsoncpp" OFF)
+option (OPENDHT_PROXY_SERVER_OPTIONAL "Enable sign and encrypt endpoints" OFF)
+option (OPENDHT_PROXY_CLIENT "Enable DHT proxy client, use Restbed and jsoncpp" OFF)
 
 find_package(Doxygen)
 option (OPENDHT_DOCUMENTATION "Create and install the HTML based API documentation (requires Doxygen)" ${DOXYGEN_FOUND})
@@ -41,6 +44,10 @@ if (NOT OPENDHT_ARGON2)
         set(OPENDHT_ARGON2 ON)
     endif()
 endif ()
+if (OPENDHT_PROXY_SERVER OR OPENDHT_PROXY_CLIENT)
+    find_package(Restbed REQUIRED)
+    find_package(Jsoncpp REQUIRED)
+endif()
 
 # Build flags
 set (CMAKE_CXX_STANDARD 11)
@@ -77,6 +84,12 @@ endif ()
 if (Nettle_INCLUDE_DIRS)
     include_directories (SYSTEM "${Nettle_INCLUDE_DIRS}")
 endif ()
+if (Restbed_INCLUDE_DIRS)
+    include_directories (SYSTEM "${Restbed_INCLUDE_DIRS}")
+endif ()
+if (Jsoncpp_INCLUDE_DIRS)
+    include_directories (SYSTEM "${Jsoncpp_INCLUDE_DIRS}")
+endif ()
 link_directories (${Nettle_LIBRARY_DIRS})
 include_directories (
     ./
@@ -182,8 +195,7 @@ if (OPENDHT_STATIC)
         target_link_libraries(opendht-static ${argon2_LIBRARIES})
         target_include_directories(opendht-static SYSTEM PRIVATE ${argon2_INCLUDE_DIRS})
     endif ()
-    # TODO clean RESTBED link and jsoncpp
-    target_link_libraries(opendht-static ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES} -lrestbed -ljsoncpp)
+    target_link_libraries(opendht-static ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES} ${Restbed_LIBRARIES} ${Jsoncpp_LIBRARIES})
     install (TARGETS opendht-static DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
 endif ()
 
@@ -204,8 +216,7 @@ if (OPENDHT_SHARED)
         target_link_libraries(opendht PRIVATE ${argon2_LIBRARIES})
         target_include_directories(opendht SYSTEM PRIVATE ${argon2_INCLUDE_DIRS})
     endif ()
-    # TODO clean RESTBED link and jsoncpp
-    target_link_libraries(opendht PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES} -lrestbed -ljsoncpp)
+    target_link_libraries(opendht PRIVATE ${CMAKE_THREAD_LIBS_INIT} ${GNUTLS_LIBRARIES} ${Nettle_LIBRARIES} ${Restbed_LIBRARIES} ${Jsoncpp_LIBRARIES})
     install (TARGETS opendht DESTINATION ${CMAKE_INSTALL_LIBDIR} EXPORT opendht)
 endif ()
 
diff --git a/cmake/FindJsoncpp.cmake b/cmake/FindJsoncpp.cmake
new file mode 100644
index 00000000..fccc2da3
--- /dev/null
+++ b/cmake/FindJsoncpp.cmake
@@ -0,0 +1,18 @@
+find_path (JSONCPP_INCLUDE jsoncpp
+           HINTS
+           "/usr/include"
+           "/usr/local/include"
+           "/opt/local/include"
+)
+
+if (JSONCPP_INCLUDE)
+    message(STATUS "${green}Found Jsoncpp: ${JSONCPP_INCLUDE}")
+else()
+    message(FATAL_ERROR "${red}Failed to locate Jsoncpp.}")
+endif()
+
+if (JSONCPP_INCLUDE)
+    set(JSONCPP_FOUND TRUE)
+    set(Jsoncpp_LIBRARIES jsoncpp)
+    set(Jsoncpp_INCLUDE_DIRS ${JSONCPP_INCLUDE}/jsoncpp)
+endif()
diff --git a/cmake/FindRestbed.cmake b/cmake/FindRestbed.cmake
new file mode 100644
index 00000000..440e5596
--- /dev/null
+++ b/cmake/FindRestbed.cmake
@@ -0,0 +1,18 @@
+find_path (RESTBED_INCLUDE restbed
+           HINTS
+           "/usr/include"
+           "/usr/local/include"
+           "/opt/local/include"
+)
+
+if (RESTBED_INCLUDE)
+    message(STATUS "${green}Found Restbed: ${RESTBED_INCLUDE}")
+else()
+    message(FATAL_ERROR "${red}Failed to locate Restbed.}")
+endif()
+
+if (RESTBED_INCLUDE)
+    set(RESTBED_FOUND TRUE)
+    set(Restbed_LIBRARIES restbed)
+    set(Restbed_INCLUDE_DIRS ${RESTBED_INCLUDE}/restbed)
+endif()