diff --git a/CMakeLists.txt b/CMakeLists.txt
index aef6410109..b77a41b3a0 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,18 +170,15 @@ endif ()
 
 file(TO_NATIVE_PATH "${VARDIR_NATIVE}" VARDIR_NATIVE)
 
+FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/var/lib/arangodb")
+FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/var/lib/arangodb-apps")
+
 ################################################################################
 ### @brief TRI_BINDIR
 ################################################################################
 
 set(TRI_BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
 
-################################################################################
-### @brief database directory
-################################################################################
-
-FILE(MAKE_DIRECTORY "${PROJECT_BINARY_DIR}/var/lib/arangodb")
-
 ################################################################################
 ### @brief apps directory
 ################################################################################
diff --git a/Installation/MacOSX/Bundle/arangodb-cli.sh b/Installation/MacOSX/Bundle/arangodb-cli.sh
index f9ff9e27e6..482a468a1f 100755
--- a/Installation/MacOSX/Bundle/arangodb-cli.sh
+++ b/Installation/MacOSX/Bundle/arangodb-cli.sh
@@ -13,8 +13,7 @@ for script in $SCRIPTS; do
     echo "#!/bin/bash"
     echo
     echo "export ARANGODB_ROOT=\"${ARANGODB_ROOT}Contents/MacOS/\""
-    echo "export DATABASEDIR=\"\${ARANGODB_ROOT}opt/arangodb/var/lib/arangodb\""
-    echo "export LOGDIR=\"\${ARANGODB_ROOT}opt/arangodb/var/log/arangodb\""
+    echo "export LOCALSTATEDIR=\"\${ARANGODB_ROOT}opt/arangodb/var\""
     echo "export PKGDATADIR=\"\${ARANGODB_ROOT}opt/arangodb/share/arangodb\""
     echo
     if [ "$base" == "arango-dfdb" ];  then
diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
index a1fbc65d25..7059d31847 100755
--- a/arangod/CMakeLists.txt
+++ b/arangod/CMakeLists.txt
@@ -210,6 +210,10 @@ install(
   DIRECTORY ${PROJECT_BINARY_DIR}/var/lib/arangodb
   DESTINATION ${VARDIR_INSTALL}/lib)
 
+install(
+  DIRECTORY ${PROJECT_BINARY_DIR}/var/lib/arangodb-apps
+  DESTINATION ${VARDIR_INSTALL}/lib)
+
 ## -----------------------------------------------------------------------------
 ## --SECTION--                                                       END-OF-FILE
 ## -----------------------------------------------------------------------------