diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index 4d19b9061..841eaaa7f 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -30,7 +30,7 @@
   .content
     = t('aspects.index.help.here_to_help')
     %br
-    = t('aspects.index.help.did_you')
+    = t('aspects.index.help.do_you')
     %br
     != t('aspects.index.help.have_a_question', :link => link_to("#question" , tag_path(:name => "question")))
     %br
@@ -40,10 +40,10 @@
     %br
     %br
     %p
-      != t('aspects.index.help.satisfaction', :link => link_to("GetSatisfaction", "http://getsatisfaction.com/diaspora"))
-      %br
-      != t('aspects.index.help.tutorials', :link => link_to("Diasporial" , "http://diasporial.com/tutorials"))
-      %br
+      != t('aspects.index.help.feature_and_forum', :gs=> link_to("GetSatisfaction", "http://getsatisfaction.com/diaspora", :target => '_blank'), :forum => link_to("Forum", "http://www.diasporaforum.org/", :target => '_blank'))
+    %p
+      != t('aspects.index.help.tutorials_and_wiki', :tutorial => link_to("Diasporial" , "http://diasporial.com/tutorials", :target => '_blank'), :wiki => link_to('Wiki','http://github.com/diaspora/diaspora/wiki', :target => '_blank'))
+    %p
       != t('aspects.index.help.email_feedback', :link => link_to("Email" , "mailto:yosem@joindiaspora.com"))
 
 - unless AppConfig.configured_services.blank? || all_services_connected?
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index b04b2a44c..fbe2ed6b7 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -168,11 +168,15 @@ en:
       help:
         need_help: "Need Help?"
         here_to_help: "The Diaspora community is here!"
-        did_you: "Did you:"
+        do_you: "Do you:"
         have_a_question: "... have a %{link}?"
         find_a_bug: "... find a %{link}?"
         feature_suggestion: "... have a %{link} suggestion?"
-        tutorials: "%{link}: Community-powered tutorials, how-to, and news"
+
+        tutorials_and_wiki: "%{tutorial} & %{wiki}: Community-powered tutorials, how-to, and news"
+
+        feature_and_forum: "%{gs} & %{forum}: Community-powered support and feature requests"
+
         satisfaction: "%{link}: Community-powered support"
         email_feedback: "%{link} your feedback, if you prefer"
       cubbies: