diff --git a/app/views/shared/_links.haml b/app/views/shared/_links.haml
index 1567e0159..8be514a17 100644
--- a/app/views/shared/_links.haml
+++ b/app/views/shared/_links.haml
@@ -1,8 +1,11 @@
-%li= link_to 'diasporafoundation.org', "https://diasporafoundation.org"
-%li= link_to 'Wiki', "https://wiki.diasporafoundation.org"
-%li= link_to t('layouts.application.whats_new'), changelog_url
-%li= link_to t('layouts.header.code') + " " + pod_version, "#{source_url}", {:title => t('layouts.application.source_package')}
+%li= link_to "diasporafoundation.org", "https://diasporafoundation.org"
+%li= link_to "Wiki", "https://wiki.diasporafoundation.org"
+%li= link_to t("layouts.application.discourse"), "https://discourse.diasporafoundation.org"
+%li= link_to t("layouts.application.whats_new"), changelog_url
+%li= link_to t("layouts.header.code") + " " + pod_version,
+  source_url.to_s,
+  title: t("layouts.application.source_package")
 %li= link_to t("layouts.application.statistics_link"), statistics_path
-%li= link_to(t('layouts.application.toggle'), toggle_mobile_path)
+%li= link_to(t("layouts.application.toggle"), toggle_mobile_path)
 - if AppConfig.settings.terms.enable?
-    %li= link_to(t('_terms'), terms_path)
+  %li= link_to(t("_terms"), terms_path)
diff --git a/app/views/streams/main_stream.html.haml b/app/views/streams/main_stream.html.haml
index da6c31f75..29da6a6c9 100644
--- a/app/views/streams/main_stream.html.haml
+++ b/app/views/streams/main_stream.html.haml
@@ -91,8 +91,8 @@
                   "https://wiki.diasporafoundation.org/How_to_report_a_bug"))
               %li
                 != t("aspects.index.help.feature_suggestion",
-                  link: link_to("#" + t("aspects.index.help.tag_feature"),
-                  tag_path(name: t("aspects.index.help.tag_feature"))))
+                  link: link_to(t("aspects.index.help.tag_feature"),
+                  "https://discourse.diasporafoundation.org/c/features-and-ideas"))
             %p
               != t("aspects.index.help.tutorials_and_wiki",
                 faq: link_to(t("_help"), help_path),
@@ -102,6 +102,11 @@
                   target: "_blank"),
                 target: "_blank")
 
+            %p
+              != t("aspects.index.help.support_forum",
+                support_forum: link_to(t("aspects.index.help.support_forum_link"),
+                "https://discourse.diasporafoundation.org/c/support", target: "_blank"))
+
         - unless AppConfig.configured_services.blank? || all_services_connected?
           .section.collapsed
             .title
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index dc1a1f961..4a2543d12 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -217,6 +217,8 @@ en:
         tag_feature: "feature"
         tutorials_and_wiki: "%{faq}, %{tutorial} & %{wiki}: help for your first steps."
         tutorial_link_text: "Tutorials"
+        support_forum: "You can also join the %{support_forum}."
+        support_forum_link: "support forum"
         any_problem: "Got a problem?"
         contact_podmin: "Contact the administrator of your pod!"
         mail_podmin: "Podmin email"
@@ -585,6 +587,7 @@ en:
       powered_by: "Powered by diaspora*"
       whats_new: "What’s new?"
       statistics_link: "Pod statistics"
+      discourse: "Project discussions and support"
       toggle: "Toggle mobile"
       public_feed: "Public diaspora* feed for %{name}"
       back_to_top: "Back to top"