diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2eafbe911f..9cbb3adb9f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,7 +117,7 @@ endif ()
 
 file(TO_NATIVE_PATH "${ETCDIR_NATIVE}" ETCDIR_NATIVE)
 
-add_definitions("-D_ETCDIR_=\"${ETCDIR_NATIVE}\"")
+add_definitions("-D_SYSCONFDIR_=\"${ETCDIR_NATIVE}\"")
 
 ################################################################################
 ### @brief DATA DIRECTORY (/var)
diff --git a/arangod/CMakeLists.txt b/arangod/CMakeLists.txt
index a33488e1bf..94fd1dbc79 100644
--- a/arangod/CMakeLists.txt
+++ b/arangod/CMakeLists.txt
@@ -157,13 +157,10 @@ if (USE_RAW_CONFIG)
 endif ()
 
 if (BUILD_PACKAGE STREQUAL "raspbian")
-  install(
-    FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-arm.conf
-    DESTINATION ${ETCDIR_NATIVE})
-
   install(
     FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod-uid-arm.conf
-    DESTINATION ${ETCDIR_NATIVE})
+    DESTINATION ${ETCDIR_NATIVE}
+    RENAME arangod.conf)
 else ()
   install(
     FILES ${PROJECT_SOURCE_DIR}/etc/arangodb/arangod.conf