diff --git a/swagger/client-server/api-docs b/swagger/client-server/api-docs
index a80b3bb3..9c8c6066 100644
--- a/swagger/client-server/api-docs
+++ b/swagger/client-server/api-docs
@@ -29,6 +29,10 @@
     {
       "path": "-directory",
       "description": "Directory operations"
+    },
+    {
+      "path": "-content",
+      "description": "Content repository operations"
     }
   ],
   "authorizations": {
diff --git a/swagger/client-server/api-docs-content b/swagger/client-server/api-docs-content
new file mode 100644
index 00000000..67f850b3
--- /dev/null
+++ b/swagger/client-server/api-docs-content
@@ -0,0 +1,67 @@
+{
+  "apiVersion": "1.0.0",
+  "swaggerVersion": "1.2",
+  "basePath": "http://localhost:8008/_matrix",
+  "resourcePath": "/media/v1/",
+  "apis": [
+    {
+      "path": "/media/v1/upload",
+      "operations": [
+        {
+          "method": "POST",
+          "summary": "Upload some content to the content repository.",
+          "type": "ContentUploadResponse",
+          "nickname": "upload_content",
+          "parameters": [
+            {
+              "name": "body",
+              "description": "The file to upload.",
+              "required": true,
+              "type": "file",
+              "paramType": "body"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "path": "/media/v1/download/{serverName}/{mediaId}",
+      "operations": [
+        {
+          "method": "GET",
+          "summary": "Get the content stored at this address.",
+          "type": "file",
+          "nickname": "download_content",
+          "parameters": [
+            {
+              "name": "serverName",
+              "description": "The serverName from the mxc://<serverName>/<mediaId> URI (the authority component).",
+              "required": true,
+              "type": "string",
+              "paramType": "path"
+            },
+            {
+              "name": "mediaId",
+              "description": "The mediaId from the mxc://<serverName>/<mediaId> URI (the path component).",
+              "required": true,
+              "type": "string",
+              "paramType": "path"
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "models": {
+    "ContentUploadResponse": {
+      "id": "ContentUploadResponse",
+      "properties": {
+        "content_uri": {
+          "type": "string",
+          "description": "The mxc:// URI where this content is stored. This is of the form 'mxc://{serverName}/{mediaId}'",
+          "required": true
+        }
+      }
+    }
+  }
+}