diff --git a/Documentation/Scripts/generateSwaggerApi.py b/Documentation/Scripts/generateSwaggerApi.py
index ed5e83f438..4123e370e0 100644
--- a/Documentation/Scripts/generateSwaggerApi.py
+++ b/Documentation/Scripts/generateSwaggerApi.py
@@ -42,18 +42,18 @@
 import sys, os, json, string
 
 files = { 
-  "arangod/RestHandler/RestEdgeHandler.cpp" : "edge",
-  "arangod/RestHandler/RestDocumentHandler.cpp" : "document",
-  "arangod/RestHandler/RestReplicationHandler.cpp" : "replication",
+  "js/actions/api-aqlfunction.js" : "aqlfunction",
   "js/actions/api-collection.js" : "collection",
-  "js/actions/api-graph.js" : "graph",
+  "arangod/RestHandler/RestDocumentHandler.cpp" : "document",
+  "arangod/RestHandler/RestEdgeHandler.cpp" : "edge",
   "js/actions/api-edges.js" : "edges",
+  "js/actions/api-graph.js" : "graph",
   "js/actions/api-user.js" : "user",
   "js/actions/api-system.js" : "system",
   "js/actions/api-cursor.js" : "cursor",
   "js/actions/api-explain.js" : "explain",
   "js/actions/api-index.js" : "index",
-  "js/actions/api-aqlfunction.js" : "aqlfunction",
+  "arangod/RestHandler/RestReplicationHandler.cpp" : "replication",
   "js/actions/api-simple.js" : "simple",
   "js/actions/api-query.js" : "query",
   "js/actions/api-structure.js" : "structure",
@@ -81,8 +81,7 @@ apis = [ ];
 
 # print "Generating Swagger docs for code in " + scriptDir + ", outdir: " + outDir + "\n"
 
-for filename in files.keys():
-  name = files[filename]
+for filename, name in sorted(files.iteritems(), key=lambda (k, v): (v, k)):
   outfile = outDir + name + ".json"
 
   os.system("python " + scriptDir + "Documentation/Scripts/generateSwagger.py < " + scriptDir + filename + " > " + outfile)
diff --git a/html/admin/api-docs.json b/html/admin/api-docs.json
index 5d5ddc1fcf..e6a87763f9 100644
--- a/html/admin/api-docs.json
+++ b/html/admin/api-docs.json
@@ -2,65 +2,13 @@
     "swaggerVersion": "1.1", 
     "apiVersion": "1.4", 
     "apis": [
-        {
-            "path": "api-docs/collection.{format}", 
-            "description": "collection API"
-        }, 
         {
             "path": "api-docs/aqlfunction.{format}", 
             "description": "aqlfunction API"
         }, 
         {
-            "path": "api-docs/structure.{format}", 
-            "description": "structure API"
-        }, 
-        {
-            "path": "api-docs/query.{format}", 
-            "description": "query API"
-        }, 
-        {
-            "path": "api-docs/explain.{format}", 
-            "description": "explain API"
-        }, 
-        {
-            "path": "api-docs/index.{format}", 
-            "description": "index API"
-        }, 
-        {
-            "path": "api-docs/edges.{format}", 
-            "description": "edges API"
-        }, 
-        {
-            "path": "api-docs/simple.{format}", 
-            "description": "simple API"
-        }, 
-        {
-            "path": "api-docs/transaction.{format}", 
-            "description": "transaction API"
-        }, 
-        {
-            "path": "api-docs/graph.{format}", 
-            "description": "graph API"
-        }, 
-        {
-            "path": "api-docs/edge.{format}", 
-            "description": "edge API"
-        }, 
-        {
-            "path": "api-docs/replication.{format}", 
-            "description": "replication API"
-        }, 
-        {
-            "path": "api-docs/system.{format}", 
-            "description": "system API"
-        }, 
-        {
-            "path": "api-docs/traversal.{format}", 
-            "description": "traversal API"
-        }, 
-        {
-            "path": "api-docs/user.{format}", 
-            "description": "user API"
+            "path": "api-docs/collection.{format}", 
+            "description": "collection API"
         }, 
         {
             "path": "api-docs/cursor.{format}", 
@@ -69,6 +17,58 @@
         {
             "path": "api-docs/document.{format}", 
             "description": "document API"
+        }, 
+        {
+            "path": "api-docs/edge.{format}", 
+            "description": "edge API"
+        }, 
+        {
+            "path": "api-docs/edges.{format}", 
+            "description": "edges API"
+        }, 
+        {
+            "path": "api-docs/explain.{format}", 
+            "description": "explain API"
+        }, 
+        {
+            "path": "api-docs/graph.{format}", 
+            "description": "graph API"
+        }, 
+        {
+            "path": "api-docs/index.{format}", 
+            "description": "index API"
+        }, 
+        {
+            "path": "api-docs/query.{format}", 
+            "description": "query API"
+        }, 
+        {
+            "path": "api-docs/replication.{format}", 
+            "description": "replication API"
+        }, 
+        {
+            "path": "api-docs/simple.{format}", 
+            "description": "simple API"
+        }, 
+        {
+            "path": "api-docs/structure.{format}", 
+            "description": "structure API"
+        }, 
+        {
+            "path": "api-docs/system.{format}", 
+            "description": "system API"
+        }, 
+        {
+            "path": "api-docs/transaction.{format}", 
+            "description": "transaction API"
+        }, 
+        {
+            "path": "api-docs/traversal.{format}", 
+            "description": "traversal API"
+        }, 
+        {
+            "path": "api-docs/user.{format}", 
+            "description": "user API"
         }
     ]
 }