diff --git a/Documentation/Makefile.files b/Documentation/Makefile.files
index dc357d234d..eb53c3d4a5 100644
--- a/Documentation/Makefile.files
+++ b/Documentation/Makefile.files
@@ -331,6 +331,9 @@ swagger:
 	python @srcdir@/Documentation/Scripts/generateSwagger.py \
 		< @srcdir@/js/actions/api-index.js  > @srcdir@/html/admin/api-docs/index
 
+	python @srcdir@/Documentation/Scripts/generateSwagger.py \
+		< @srcdir@/js/actions/api-aqlfunction.js  > @srcdir@/html/admin/api-docs/aqlfunction
+
 	python @srcdir@/Documentation/Scripts/generateSwagger.py \
 		< @srcdir@/js/actions/api-simple.js  > @srcdir@/html/admin/api-docs/simple
 
diff --git a/html/admin/api-docs.json b/html/admin/api-docs.json
deleted file mode 100644
index def52be025..0000000000
--- a/html/admin/api-docs.json
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-  "apiVersion":"1.2beta",
-  "swaggerVersion":"1.1",
-  "basexPath":"http://192.168.173.10:8529/_admin/html/api-docs",
-  "apis":[    {
-      "path": "/document",
-      "description": "Interface for Documents"
-    },
-    {
-      "path": "/edges",
-      "description": "Interface for Edges"
-    },
-    {
-      "path": "/collection",
-      "description": "Interface for Collections"
-    },
-    {
-      "path": "/graph",
-      "description": "Interface for Graphs"
-    },
-    {
-      "path": "/user",
-      "description": "Interface for Users"
-    },
-    {
-      "path": "/system",
-      "description": "Interface for System"
-    },
-    {
-      "path": "/cursor",
-      "description": "Interface for Cursors"
-    },
-    {
-      "path": "/explain",
-      "description": "Interface for Explain"
-    },
-    {
-      "path": "/index",
-      "description": "Interface for Indexes"
-    },
-    {
-      "path": "/simple",
-      "description": "Interface for SimpleQueries"
-    },
-    {
-      "path": "/query",
-      "description": "Interface for Queries"
-    },
-    {
-      "path": "/structure",
-      "description": "Interface for Structures"
-    }]
-  }
diff --git a/html/admin/api-docs/api-docs.json b/html/admin/api-docs/api-docs.json
index b2cb506e4c..376b221b56 100644
--- a/html/admin/api-docs/api-docs.json
+++ b/html/admin/api-docs/api-docs.json
@@ -41,6 +41,10 @@
       "path": "/simple",
       "description": "Interface for SimpleQueries"
     },
+    {
+      "path": "/aqlfunction",
+      "description": "Interface for AQL functions"
+    },
     {
       "path": "/query",
       "description": "Interface for Queries"
diff --git a/html/admin/swagger.html b/html/admin/swagger.html
index 2885a4e211..2221b5a5ab 100644
--- a/html/admin/swagger.html
+++ b/html/admin/swagger.html
@@ -58,7 +58,7 @@
     <script type="text/javascript">
         $(function () {
             window.swaggerUi = new SwaggerUi({
-                discoveryUrl:"http://192.168.173.10:8529/_admin/html/api-docs/api-docs.json",
+                discoveryUrl:"/_admin/html/api-docs/api-docs.json",
                 apiKey: false,
                 dom_id:"swagger-ui-container",
                 supportHeaderParams: true,