diff --git a/src/prog/restd/builders/cmake/CMakeLists.txt b/src/prog/restd/builders/cmake/CMakeLists.txt
index ba7c9b4c..7ea5abac 100644
--- a/src/prog/restd/builders/cmake/CMakeLists.txt
+++ b/src/prog/restd/builders/cmake/CMakeLists.txt
@@ -1,46 +1,44 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.0)
 
 project(restd)
 
-include (libcivetweb)
-include (libjsoncpp)
-include (libubus)
-include (libubox)
-include (libubuscpp)
+set (CMAKE_MODULE_PATH "${MODULE_PATH}")
+set (CMAKE_CXX_STANDARD 11)
 
-include_directories(../../src)
+include (br)
 
-set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wextra -pedantic -Werror=strict-aliasing")
+include_directories ($ENV{SRC_DIR}/src/prog/restd/src/)
+
+set(CMAKE_CXX_FLAGS "-Wall -Wextra -pedantic -Werror=strict-aliasing")
 
 file (
 	GLOB_RECURSE
 	source_files
-	../../src/main.cpp
-	../../src/authorize.cpp
-	../../src/session.cpp
-	../../src/message.cpp
-	../../src/routes/ExitHandler.cpp
-	../../src/routes/UbusHandler.cpp
+	$ENV{SRC_DIR}/src/prog/restd/src/main.cpp
+	$ENV{SRC_DIR}/src/prog/restd/src/authorize.cpp
+	$ENV{SRC_DIR}/src/prog/restd/src/session.cpp
+	$ENV{SRC_DIR}/src/prog/restd/src/message.cpp
+	$ENV{SRC_DIR}/src/prog/restd/src/routes/ExitHandler.cpp
+	$ENV{SRC_DIR}/src/prog/restd/src/routes/UbusHandler.cpp
 )
 
-add_executable (
-        restd
-        ${source_files}
-)
+add_executable (restd ${source_files})
 
 target_link_libraries (restd 
 	LINK_PUBLIC
-	civetweb
-	ubus
-	ubuscpp
+	pthread
 	dl
 	crypt
-	jsoncpp
+	ubus
+	ubus-cpp
+	json-cpp
+	civetweb-cpp
 )
 
+install (TARGETS restd DESTINATION local/bin)
 
-add_custom_command(
-    TARGET restd
-    POST_BUILD
-    COMMAND cp ${CMAKE_SOURCE_DIR}/certificate/ssl_cert.pem ${CMAKE_SOURCE_DIR}/build/
- )
+#add_custom_command(
+#    TARGET restd
+#    POST_BUILD
+#    COMMAND cp ${CMAKE_SOURCE_DIR}/certificate/ssl_cert.pem ${CMAKE_SOURCE_DIR}/build/
+# )
diff --git a/src/prog/restd/src/restd.h b/src/prog/restd/src/restd.h
index a554f439..e8ae830c 100644
--- a/src/prog/restd/src/restd.h
+++ b/src/prog/restd/src/restd.h
@@ -30,7 +30,7 @@
 
 #include <pthread.h>
 
-#include <CivetServer.h>
+#include <civetweb/CivetServer.h>
 
 /*--------------------------------- Define ----------------------------------*/
 
diff --git a/src/prog/restd/src/routes/ExitHandler.h b/src/prog/restd/src/routes/ExitHandler.h
index 86dac14a..25ad2660 100644
--- a/src/prog/restd/src/routes/ExitHandler.h
+++ b/src/prog/restd/src/routes/ExitHandler.h
@@ -28,7 +28,7 @@
 
 /*-------------------------------- INCLUDES ---------------------------------*/
 
-#include <CivetServer.h>
+#include <civetweb/CivetServer.h>
 
 /*---------------------------------- CLASS ----------------------------------*/
 
diff --git a/src/prog/restd/src/routes/UbusHandler.cpp b/src/prog/restd/src/routes/UbusHandler.cpp
index a2031e3d..0f9cb42c 100644
--- a/src/prog/restd/src/routes/UbusHandler.cpp
+++ b/src/prog/restd/src/routes/UbusHandler.cpp
@@ -29,7 +29,7 @@
 
 #include <jsoncpp/reader.h>
 
-#include <ubuscpp/UBusCall.h>
+#include <ubus-cpp/UBusCall.h>
 
 #include "UbusHandler.h"
 
diff --git a/src/prog/restd/src/routes/UbusHandler.h b/src/prog/restd/src/routes/UbusHandler.h
index 2f9d46e1..02d97ff0 100644
--- a/src/prog/restd/src/routes/UbusHandler.h
+++ b/src/prog/restd/src/routes/UbusHandler.h
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <jsoncpp/json.h>
 
-#include <CivetServer.h>
+#include <civetweb/CivetServer.h>
 
 /*---------------------------------- CLASS ----------------------------------*/