diff --git a/3rdParty/OpenSSL/CMakeLists.txt b/3rdParty/OpenSSL/CMakeLists.txt
index 7d4b36f360..0803e6d574 100644
--- a/3rdParty/OpenSSL/CMakeLists.txt
+++ b/3rdParty/OpenSSL/CMakeLists.txt
@@ -28,3 +28,10 @@ set(OPENSSL_INCLUDE_DIR
   "OpenSSL: Include Directory"
   FORCE
 )
+
+set(OPENSSL_LIBRARIES
+  "${OPENSSL_LIBRARIES}"
+  CACHE INTERNAL
+  "OpenSSL: Libraries Directory"
+  FORCE
+)
diff --git a/3rdParty/V8/CMakeLists.txt b/3rdParty/V8/CMakeLists.txt
index 051667fc70..c122463c78 100644
--- a/3rdParty/V8/CMakeLists.txt
+++ b/3rdParty/V8/CMakeLists.txt
@@ -91,6 +91,9 @@ else ()
   endif ()
 endif()
 
+list(APPEND V8_COMPILE_ARGS icui18n icuuc icudata)
+list(APPEND V8_COMPILE_ARGS v8)
+
 ExternalProject_Add(v8_build
   BUILD_IN_SOURCE TRUE
   SOURCE_DIR "${V8_DIR}"
diff --git a/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt b/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt
index 323f7a5d7d..a96ed4ce9b 100644
--- a/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt
+++ b/3rdParty/zlib/zlib-1.2.8/CMakeLists.txt
@@ -241,11 +241,11 @@ endif()
 
 include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR})
 
-add_executable(example test/example.c)
+add_executable(example EXCLUDE_FROM_ALL test/example.c)
 target_link_libraries(example zlib)
 add_test(example example)
 
-add_executable(minigzip test/minigzip.c)
+add_executable(minigzip EXCLUDE_FROM_ALL test/minigzip.c)
 target_link_libraries(minigzip zlib)
 
 if(HAVE_OFF64_T)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 37618883c8..8f685ae9ed 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -326,9 +326,8 @@ endif ()
 
 include(VcMacros)
 
-# we do not want to build specialized packages for one architecture
-# include(OptimizeForArchitecture)
-# OptimizeForArchitecture()
+include(OptimizeForArchitecture)
+OptimizeForArchitecture()
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_ARCHITECTURE_FLAGS}")
 
@@ -563,3 +562,12 @@ add_subdirectory(arangosh)
 add_subdirectory(arangod)
 add_subdirectory(UnitTests)
 add_subdirectory(Documentation)
+
+add_dependencies(arangob zlibstatic v8_build)
+add_dependencies(arangod ev zlibstatic v8_build)
+add_dependencies(arangodump zlibstatic v8_build)
+add_dependencies(arangoimp zlibstatic v8_build)
+add_dependencies(arangorestore zlibstatic v8_build)
+add_dependencies(arangosh zlibstatic v8_build)
+add_dependencies(basics_suite v8_build)
+add_dependencies(geo_suite v8_build)