diff --git a/admin_manual/installation/apps_supported.rst b/admin_manual/installation/apps_supported.rst
index 2560abac5..a701cc84c 100644
--- a/admin_manual/installation/apps_supported.rst
+++ b/admin_manual/installation/apps_supported.rst
@@ -4,49 +4,61 @@ Supported apps
 
 Below is the list of apps supported for Nextcloud |version|. Supported here means that we'll accept bugreports and resolve them in these apps with regard to functionality and compatibility with Nextcloud |version|. To get access to work-arounds, long term support, priority bug fixing and custom consulting, contact Nextcloud GmbH.
 
-* Activity
-* Admin Audit Log
-* Antivirus
-* Calendar
-* Circles
-* Collaborative Tags
-* Comments
-* Contacts
-* Encryption
-* External Sites
-* Federated File Sharing (allows file sharing across Nextcloud instances)
-* Federation (allows usernname auto-complete across Nextcloud instances)
-* Files (cannot be disabled)
-* Files Access Control
-* Files Automated Tagging
-* Files External (external storage)
-* Files PDF Viewer
-* Files Sharing
-* Files Text Editor
-* Files Trashbin
-* Files Versions
-* Files Video Player
-* First Run Wizard
-* Gallery
-* Logreader
-* Lookup Server Connector
-* Nextcloud Announcements
-* Notifications
-* Object Storage (Swift)
-* Password Policy
-* Provisioning API
-* Server info (monitoring app)
-* Sharebymail
-* Socialsharing (Diaspora, email, Facebook, Google+ and Twitter)
-* Sharepoint (external storage)
-* Template Editor (for notification emails)
-* Theming
-* Update Notifications
-* User External
-* User LDAP
-* User Shibboleth/SAML
-* Talk
-* WebDAV Endpoint (handles old and new webdav endpoints)
-* Workflow Engine (cannot be disabled)
+All apps are licensed under ``AGPLv3``.
 
-All apps are licensed under the AGPL.
+Nextcloud Files
+---------------
+
+* [Activity](https://github.com/nextcloud/activity)
+* [Auditing / Logging](https://github.com/nextcloud/server/tree/master/apps/admin_audit)
+* [Antivirus for files](https://github.com/nextcloud/files_antivirus)
+* [Circles](https://github.com/nextcloud/circles)
+* [Collaborative Tags](https://github.com/nextcloud/server/tree/master/apps/systemtags)
+* [Comments](https://github.com/nextcloud/server/tree/master/apps/comments)
+* [Default encryption module](https://github.com/nextcloud/server/tree/master/apps/encryption)
+* [External Sites](https://github.com/nextcloud/external)
+* [Federated file sharing](https://github.com/nextcloud/server/tree/master/apps/federatedfilesharing)
+* [Federation](https://github.com/nextcloud/server/tree/master/apps/federation)
+* [Files](https://github.com/nextcloud/server/tree/master/apps/files)
+* [Files access control](https://github.com/nextcloud/files_accesscontrol)
+* [Files Automated Tagging](https://github.com/nextcloud/files_automatedtagging)
+* [External storage support](https://github.com/nextcloud/server/tree/master/apps/files_external)
+* [PDF Viewer](https://github.com/nextcloud/files_pdfviewer)
+* [File sharing](https://github.com/nextcloud/server/tree/master/apps/files_sharing)
+* [Text Editor](https://github.com/nextcloud/files_texteditor)
+* [Deleted files](https://github.com/nextcloud/server/tree/master/apps/files_trashbin)
+* [Versions](https://github.com/nextcloud/server/tree/master/apps/files_versions)
+* [Video Player](https://github.com/nextcloud/files_videoplayer)
+* [First run wizard](https://github.com/nextcloud/firstrunwizard)
+* [Gallery](https://github.com/nextcloud/gallery)
+* [Log Reader](https://github.com/nextcloud/logreader)
+* [Lookup Server Connector](https://github.com/nextcloud/server/tree/master/apps/lookup_server_connector)
+* [Nextcloud announcements](https://github.com/nextcloud/nextcloud_announcements/blob/master/appinfo/info.xml)
+* [Notifications](https://github.com/nextcloud/notifications)
+* [Password policy](https://github.com/nextcloud/password_policy)
+* [Provisioning API](https://github.com/nextcloud/server/tree/master/apps/provisioning_api)
+* [Monitoring](https://github.com/nextcloud/serverinfo)
+* [Share by mail](https://github.com/nextcloud/server/tree/master/apps/sharebymail)
+* Social sharing via:
+    * [Diaspora](https://github.com/nextcloud/socialsharing/tree/master/socialsharing_diaspora)
+    * [Email](https://github.com/nextcloud/socialsharing/tree/master/socialsharing_email)
+    * [Facebook](https://github.com/nextcloud/socialsharing/tree/master/socialsharing_facebook)
+    * [Twitter](https://github.com/nextcloud/socialsharing/tree/master/socialsharing_twitter)
+* [SharePoint Backend](https://github.com/nextcloud/sharepoint/blob/master/appinfo/info.xml)
+* [Theming](https://github.com/nextcloud/server/tree/master/apps/theming)
+* [Update Notifications](https://github.com/nextcloud/server/tree/master/apps/updatenotification)
+* [LDAP user and group backend](https://github.com/nextcloud/server/blob/master/apps/user_ldap)
+* [SSO & SAML authentication](https://github.com/nextcloud/user_saml)
+* [WebDAV endpoint](https://github.com/nextcloud/server/blob/master/apps/dav)
+* [Files workflow engine](https://github.com/nextcloud/server/tree/master/apps/workflowengine)
+
+Nextcloud Groupware
+-------------------
+
+* [Calendar](https://github.com/nextcloud/calendar)
+* [Contacts](https://github.com/nextcloud/contacts)
+
+Nextcloud Talk
+--------------
+
+** [Talk](https://github.com/nextcloud/spreed)