diff --git a/CMakeLists.txt b/CMakeLists.txt
index 455d612e95..de001f3a07 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -579,7 +579,7 @@ elseif (DARWIN)
   set(ICU_LIBS icui18n;icuuc;icudata;pthread;dl;m CACHE path "ICU libraries")
 else ()
   set(ICU_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/V8-3.31.74.1/third_party/icu/source/common;${PROJECT_SOURCE_DIR}/3rdParty/V8-3.31.74.1/third_party/icu/source/i18n;${PROJECT_SOURCE_DIR}/3rdParty/V8-3.31.74.1/third_party/icu/source/io CACHE path "ICU include path")
-  set(ICU_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty/V8-3.31.74.1/out/x64.release/obj.target/tools/gyp/ CACHE path "ICU library path")
+  set(ICU_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty/V8-3.31.74.1/out/x64.release/obj.target/third_party/icu/ CACHE path "ICU library path")
   set(ICU_LIBS icui18n;icuuc;icudata;pthread;dl;m CACHE path "ICU libraries")
 endif ()
 
@@ -693,10 +693,14 @@ set(V8_VERSION "unknown" CACHE string "V8 version")
 
 if (MSVC OR RASPBIAN)
   set(V8_LIBS v8_base;v8_libbase;v8_libplatform;v8_nosnapshot CACHE string "V8 libraries")
-else ()
+elseif (DARWIN)
   set(V8_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/V8-3.31.74.1/include CACHE path "V8 include path")
   set(V8_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty/V8-3.31.74.1/out/x64.release CACHE path "V8 library path")
   set(V8_LIBS v8_base;v8_libbase;v8_libplatform;v8_nosnapshot CACHE string "V8 libraries")
+else ()
+  set(V8_INCLUDE ${PROJECT_SOURCE_DIR}/3rdParty/V8-3.31.74.1/include CACHE path "V8 include path")
+  set(V8_LIB_PATH ${PROJECT_SOURCE_DIR}/3rdParty/V8-3.31.74.1/out/x64.release/obj.target/tools/gyp CACHE path "V8 library path")
+  set(V8_LIBS v8_base;v8_libbase;v8_libplatform;v8_nosnapshot CACHE string "V8 libraries")
 endif ()
 
 if (V8_INCLUDE)
diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
index 9cebb4b563..7a1f316820 100644
--- a/arangod/CMakeLists.txt
+++ b/arangod/CMakeLists.txt
@@ -218,12 +218,28 @@ install(
   REGEX "^.*/server/tests$" EXCLUDE)
 
 install(
-  DIRECTORY ${PROJECT_SOURCE_DIR}/js/node ${PROJECT_SOURCE_DIR}/js/apps
+  DIRECTORY ${PROJECT_SOURCE_DIR}/js/node 
   DESTINATION share/arangodb/js
   REGEX ".travis.yml" EXCLUDE
   REGEX ".npmignore" EXCLUDE
   PATTERN "_db" EXCLUDE)
 
+install(
+  DIRECTORY ${PROJECT_SOURCE_DIR}/js/apps/system/_admin
+  DESTINATION share/arangodb/js
+  REGEX "/node_modules/" EXCLUDE
+  REGEX "/test/" EXCLUDE
+  REGEX "/test_data/" EXCLUDE
+  REGEX "/coverage/" EXCLUDE
+  PATTERN "_db" EXCLUDE)
+
+install(
+  DIRECTORY ${PROJECT_SOURCE_DIR}/js/apps/system/_api ${PROJECT_SOURCE_DIR}/js/apps/system/_system
+  DESTINATION share/arangodb/js
+  REGEX "/test/" EXCLUDE
+  REGEX "/test_data/" EXCLUDE
+  PATTERN "_db" EXCLUDE)
+
 ################################################################################
 ### @brief install arangod mruby files
 ################################################################################