diff --git a/CMakeLists.txt b/CMakeLists.txt
index 15393c8dc94141379f9c0a2cddf1243aab832f7a..1899140ff421fa822fcb0d5f6f76e4906d600184 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0)
 
 if(NOT (${SUBMODULES_NO_BUILD} MATCHES ON))
     if ( NOT ( TARGET dap_core ) )
-	add_subdirectory(libdap)
+  add_subdirectory(libdap)
     endif()
 
     if ( NOT ( TARGET dap_crypto ) )
@@ -25,6 +25,7 @@ find_package(PkgConfig)
 pkg_check_modules(PC_JSON-C REQUIRED json-c)
 
 add_subdirectory(http_server)
+add_subdirectory(libdap-server-core)
 add_subdirectory(enc_server)
 
 if (BUILD_LIB_DAP_SERVER_TESTS)
diff --git a/libdap-server-udp b/libdap-server-udp
index 4a1ea0e1a8936d8ca74a2d8cc9658bcee38e0e26..327016187f5ccec4e21b3fd22342a0dc77941960 160000
--- a/libdap-server-udp
+++ b/libdap-server-udp
@@ -1 +1 @@
-Subproject commit 4a1ea0e1a8936d8ca74a2d8cc9658bcee38e0e26
+Subproject commit 327016187f5ccec4e21b3fd22342a0dc77941960