diff --git a/docs/developer.rst b/docs/developer.rst
index bbc4244b74..a74f6c8b70 100644
--- a/docs/developer.rst
+++ b/docs/developer.rst
@@ -92,6 +92,8 @@ A full blown example would look like this (needs to be utf-8 encoded):
         <category>tools</category>
         <website>https://github.com/owncloud/news</website>
         <bugs>https://github.com/owncloud/news/issues</bugs>
+        <repository>https://github.com/owncloud/news</repository>
+        <discussion>https://help.nextcloud.com/t/nextcloud-conference-in-berlin-sept-16-22/1710</discussion>
         <screenshot>https://example.com/1.png</screenshot>
         <screenshot>https://example.com/2.jpg</screenshot>
         <dependencies>
@@ -171,6 +173,14 @@ bugs
     * optional
     * must contain an URL to the project's bug tracker
     * will be rendered on the app detail page
+repository
+    * optional
+    * must contain an URL to the project's repository
+    * currently not used
+discussion
+    * optional
+    * must contain an URL to the forum, starting with https://help.nextcloud.com
+    * will be rendered on the app detail page
 screenshot
     * optional
     * must contain an HTTPS URL to an image
diff --git a/nextcloudappstore/core/api/v1/release/importer.py b/nextcloudappstore/core/api/v1/release/importer.py
index 8c4a0949e0..dc98254a7a 100644
--- a/nextcloudappstore/core/api/v1/release/importer.py
+++ b/nextcloudappstore/core/api/v1/release/importer.py
@@ -192,6 +192,7 @@ class AppImporter(Importer):
             'user_docs': attribute_importer,
             'admin_docs': attribute_importer,
             'website': attribute_importer,
+            'discussion': attribute_importer,
             'developer_docs': attribute_importer,
             'issue_tracker': attribute_importer,
             'name': l10n_importer,
diff --git a/nextcloudappstore/core/api/v1/release/info.xsd b/nextcloudappstore/core/api/v1/release/info.xsd
index 08aefe71a6..dc1f88c0bd 100644
--- a/nextcloudappstore/core/api/v1/release/info.xsd
+++ b/nextcloudappstore/core/api/v1/release/info.xsd
@@ -32,6 +32,8 @@
                             maxOccurs="1"/>
                 <xs:element name="repository" type="repository" minOccurs="0"
                             maxOccurs="1"/>
+                <xs:element name="discussion" type="discussion-url" minOccurs="0"
+                            maxOccurs="1"/>
                 <xs:element name="screenshot" type="secure-url" minOccurs="0"
                             maxOccurs="10"/>
                 <xs:element name="dependencies" type="dependencies"
@@ -221,6 +223,14 @@
         </xs:restriction>
     </xs:simpleType>
 
+    <!-- for now only allow urls to our forum -->
+    <xs:simpleType name="discussion-url">
+        <xs:restriction base="xs:anyURI">
+            <xs:pattern value="https://help\.nextcloud\.com.*"/>
+            <xs:maxLength value="256"/>
+        </xs:restriction>
+    </xs:simpleType>
+
     <xs:simpleType name="email">
         <xs:restriction base="limited-string">
             <xs:pattern value="[^@]+@[^\.]+\..+"/>
diff --git a/nextcloudappstore/core/api/v1/release/info.xslt b/nextcloudappstore/core/api/v1/release/info.xslt
index 5e78fba167..f249c2ec49 100644
--- a/nextcloudappstore/core/api/v1/release/info.xslt
+++ b/nextcloudappstore/core/api/v1/release/info.xslt
@@ -97,6 +97,9 @@
             <issue-tracker>
                 <xsl:value-of select="bugs"/>
             </issue-tracker>
+            <discussion>
+                <xsl:value-of select="discussion"/>
+            </discussion>
 
             <!-- release -->
             <release>
diff --git a/nextcloudappstore/core/api/v1/release/pre-info.xslt b/nextcloudappstore/core/api/v1/release/pre-info.xslt
index 019644a21e..3f379b608f 100644
--- a/nextcloudappstore/core/api/v1/release/pre-info.xslt
+++ b/nextcloudappstore/core/api/v1/release/pre-info.xslt
@@ -30,6 +30,7 @@
             <xsl:copy-of select="website"/>
             <xsl:copy-of select="bugs"/>
             <xsl:copy-of select="repository"/>
+            <xsl:copy-of select="discussion"/>
             <xsl:copy-of select="screenshot"/>
             <xsl:apply-templates select="dependencies"/>
         </info>
diff --git a/nextcloudappstore/core/migrations/0006_app_discussion.py b/nextcloudappstore/core/migrations/0006_app_discussion.py
new file mode 100644
index 0000000000..7466ff4a8f
--- /dev/null
+++ b/nextcloudappstore/core/migrations/0006_app_discussion.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-07-22 16:48
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0005_auto_20160718_2039'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='app',
+            name='discussion',
+            field=models.URLField(blank=True, max_length=256, verbose_name='Discussion'),
+        ),
+    ]
diff --git a/nextcloudappstore/core/models.py b/nextcloudappstore/core/models.py
index f7434a630f..06f9c8d740 100644
--- a/nextcloudappstore/core/models.py
+++ b/nextcloudappstore/core/models.py
@@ -62,6 +62,8 @@ class App(TranslatableModel):
     issue_tracker = URLField(max_length=256, blank=True,
                              verbose_name=_('Issue tracker url'))
     website = URLField(max_length=256, blank=True, verbose_name=_('Homepage'))
+    discussion = URLField(max_length=256, blank=True,
+                          verbose_name=_('Discussion'))
     created = DateTimeField(auto_now_add=True, editable=False,
                             verbose_name=_('Created at'))
     last_modified = DateTimeField(auto_now=True, editable=False, db_index=True,
diff --git a/nextcloudappstore/core/templates/app/detail.html b/nextcloudappstore/core/templates/app/detail.html
index fff9adbe69..a9af9b2b53 100644
--- a/nextcloudappstore/core/templates/app/detail.html
+++ b/nextcloudappstore/core/templates/app/detail.html
@@ -80,6 +80,9 @@
                 {% if object.developer_docs %}
                 <li><a href="{{ object.developer_docs }}" rel="noopener noreferrer">{% trans "Developer documentation" %}</a></li>
                 {% endif %}
+                {% if object.discussion %}
+                <li><a href="{{ object.discussion }}" rel="noopener noreferrer">{% trans "Discussion" %}</a></li>
+                {% endif %}
                 <li><a href="#downloads">{% trans "Downloads" %}</a></li>
             </ul>
         </section>