diff --git a/Documentation/CMakeLists.txt b/Documentation/CMakeLists.txt
index 088c5d640e..7b7f5e3b67 100644
--- a/Documentation/CMakeLists.txt
+++ b/Documentation/CMakeLists.txt
@@ -2,16 +2,12 @@
 
 # swagger
 add_custom_target(swagger
-  COMMAND ${PYTHON_EXECUTABLE}
-    ${PROJECT_SOURCE_DIR}/Documentation/Scripts/generateSwagger.py
-    ${PROJECT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/api-docs api-docs
-    ${PROJECT_SOURCE_DIR}/Documentation/DocuBlocks/Rest/
-    > ${PROJECT_SOURCE_DIR}/js/apps/system/_admin/aardvark/APP/api-docs.json)
+  COMMAND ${PROJECT_SOURCE_DIR}/utils/generateSwagger.sh
+  WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 
 # swagger
 add_custom_target(examples
-  COMMAND ${PROJECT_SOURCE_DIR}/utils/generateExamples
+  COMMAND ${PROJECT_SOURCE_DIR}/utils/generateExamples.sh
   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
 
 # manual pages
diff --git a/utils/generateErrorfile.py b/utils/generateErrorfile.py
old mode 100755
new mode 100644
diff --git a/utils/generateExamples b/utils/generateExamples.sh
similarity index 97%
rename from utils/generateExamples
rename to utils/generateExamples.sh
index f45bb9d6be..02bf3715cc 100755
--- a/utils/generateExamples
+++ b/utils/generateExamples.sh
@@ -35,6 +35,7 @@ ${ARANGOSH} \
     --log.file ${LOGFILE} \
     --javascript.startup-directory js \
     --javascript.execute $SCRIPT \
+    --server.password "" \
     "${ARGS[@]}"
 
 if test $? -eq 0; then
diff --git a/utils/generateMimetypes.py b/utils/generateMimetypes.py
old mode 100755
new mode 100644
diff --git a/Documentation/Scripts/generateSwagger.py b/utils/generateSwagger.py
similarity index 100%
rename from Documentation/Scripts/generateSwagger.py
rename to utils/generateSwagger.py
diff --git a/utils/generateSwagger.sh b/utils/generateSwagger.sh
new file mode 100644
index 0000000000..a1db9c70ef
--- /dev/null
+++ b/utils/generateSwagger.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+python \
+  utils/generateExamples \
+  . \
+  js/apps/system/_admin/aardvark/APP/api-docs \
+  api-docs \
+  Documentation/DocuBlocks/Rest \
+  > js/apps/system/_admin/aardvark/APP/api-docs.json