diff --git a/Installation/MacOSX/Bundle/arangodb-cli.sh.in b/Installation/MacOSX/Bundle/arangodb-cli.sh.in
index 04d0e9ac5c..f7b8a8b2b6 100755
--- a/Installation/MacOSX/Bundle/arangodb-cli.sh.in
+++ b/Installation/MacOSX/Bundle/arangodb-cli.sh.in
@@ -1,10 +1,8 @@
 #!/bin/bash
-
-ROOTDIR="/Applications/@CPACK_PACKAGE_NAME@.app"
-
+ROOTDIR="`(cd \`dirname $0\` && pwd)`"
 # create start script
 
-SCRIPTS="`( cd ${ROOTDIR}/@CPACK_BUNDLE_PREFIX@@CMAKE_INSTALL_PREFIX@ && ls -1 {@CMAKE_INSTALL_BINDIR@,@CMAKE_INSTALL_SBINDIR@}/* )`"
+SCRIPTS="`( cd ${ROOTDIR}/@CMAKE_INSTALL_PREFIX@ && ls -1 {@CMAKE_INSTALL_BINDIR@,@CMAKE_INSTALL_SBINDIR@}/* )`"
 
 for script in $SCRIPTS; do
   base="`basename $script`"
@@ -12,19 +10,19 @@ for script in $SCRIPTS; do
   (
     echo "#!/bin/bash"
     echo
-    echo "export ROOTDIR=\"${ROOTDIR}/@CPACK_BUNDLE_PREFIX@@CMAKE_INSTALL_PREFIX@\""
+    echo "export ROOTDIR=\"${ROOTDIR}/@CMAKE_INSTALL_PREFIX@\""
     echo
 
     echo "exec \"\${ROOTDIR}/$script\" -c \"\${ROOTDIR}/@CMAKE_INSTALL_SYSCONFDIR_ARANGO@/${base}.conf\" \$*"
-  ) > ${ROOTDIR}/@CPACK_BUNDLE_PREFIX@/$base.$$
+  ) > ${ROOTDIR}/$base.$$
 
-  chmod 755 ${ROOTDIR}/@CPACK_BUNDLE_PREFIX@/$base.$$
-  mv ${ROOTDIR}/@CPACK_BUNDLE_PREFIX@/$base.$$ ${ROOTDIR}/@CPACK_BUNDLE_PREFIX@/$base
+  chmod 755 ${ROOTDIR}/$base.$$
+  mv ${ROOTDIR}/$base.$$ ${ROOTDIR}/$base
 done
 
 # start the server
 
-PIDFILE="${ROOTDIR}/@CPACK_BUNDLE_PREFIX@@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/run/arangod.pid"
+PIDFILE="${ROOTDIR}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/run/arangod.pid"
 
 if [ -f "${PIDFILE}" ];  then
 result=`
@@ -41,25 +39,26 @@ EOF
   fi
 fi
 
-test -d "${ROOTDIR}/@CPACK_BUNDLE_PREFIX@@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/run" || mkdir "${ROOTDIR}/@CPACK_BUNDLE_PREFIX@@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/run"
-${ROOTDIR}/@CPACK_BUNDLE_PREFIX@/arangod --daemon --pid-file "${PIDFILE}"
+test -d "${ROOTDIR}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/run" || mkdir "${ROOTDIR}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/run"
+${ROOTDIR}/arangod --daemon --pid-file "${PIDFILE}"
 
 # create some information for the user
 
 INFOFILE="/tmp/ArangoDB-CLI.info.$$"
 
 (
+  echo ""
   echo "ArangoDB server has been started"
   echo ""
   echo "The database directory is located at"
-  echo "   '${ROOTDIR}/@CPACK_BUNDLE_PREFIX@@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/lib/arangodb3'"
+  echo "   '${ROOTDIR}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/lib/arangodb3'"
   echo ""
   echo "The log file is located at"
-  echo "   '${ROOTDIR}/@CPACK_BUNDLE_PREFIX@@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/log/arangodb3/arangod.log'"
+  echo "   '${ROOTDIR}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/log/arangodb3/arangod.log'"
   echo ""
   echo "You can access the server using a browser at 'http://127.0.0.1:8529/'"
   echo "or start the ArangoDB shell"
-  echo "   '${ROOTDIR}/@CPACK_BUNDLE_PREFIX@/arangosh'"
+  echo "   '${ROOTDIR}/arangosh'"
   echo ""
   echo "Switching to log-file now, killing this windows will NOT stop the server."
   echo ""
@@ -70,7 +69,7 @@ INFOFILE="/tmp/ArangoDB-CLI.info.$$"
 
 /usr/bin/osascript <<-EOF
 tell application "Terminal"
+  do script "clear && cat $INFOFILE && rm $INFOFILE && sleep 20 && exec tail -1 -f ${ROOTDIR}/@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/log/arangodb3/arangod.log"
   activate
-  do script "clear && cat $INFOFILE && rm $INFOFILE && sleep 20 && exec tail -1 -f ${ROOTDIR}/@CPACK_BUNDLE_PREFIX@@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LOCALSTATEDIR@/log/arangodb3/arangod.log"
 end tell
 EOF