diff --git a/CMakeLists.txt b/CMakeLists.txt
index 001b4a0ffa..30135c663d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -553,18 +553,24 @@ if (CMAKE_COMPILER_IS_GNUCC OR APPLE)
 endif ()
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+  # MSVC2018.1 - MSVC2018.7 does not correctly support alignas()
   if (MSVC_VERSION VERSION_LESS 1915)
     message(FATAL_ERROR "ArangoDB Requires at least MSVC 2017 update 15.8!")
   endif()
-
-  # MSVC2018.1 - MSVC2018.7 does not correctly support alignas()
+  
   # MSVC2018.8 requires the following define
   add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
 endif()
 
 if (CMAKE_COMPILER_IS_CLANG)
   if (APPLE)
-    set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++")
+    if ($ENV{MACOSX_DEPLOYMENT_TARGET} STREQUAL "")
+      set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++")
+    else ()
+      set(BASE_C_FLAGS "${BASE_C_FLAGS} -mmacosx-version-min=$ENV{MACOSX_DEPLOYMENT_TARGET}")
+      set(BASE_CXX_FLAGS "${BASE_CXX_FLAGS} -stdlib=libc++ -mmacosx-version-min=$ENV{MACOSX_DEPLOYMENT_TARGET}")
+      set(BASE_LD_FLAGS "${BASE_LD_FLAGS} -mmacosx-version-min=$ENV{MACOSX_DEPLOYMENT_TARGET}")
+    endif ()
     add_definitions("-Wno-deprecated-declarations")
   else ()
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "3.3")