diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 45f986cc6..6fbdb13d0 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -73,4 +73,16 @@
 
       .span-24.last
         = render "posts/debug"
+    :javascript    
+        var is_ssl = ("https:" == document.location.protocol);
+        var asset_host = is_ssl ? "https://s3.amazonaws.com/getsatisfaction.com/" : "http://s3.amazonaws.com/getsatisfaction.com/";
+        document.write(unescape("%3Cscript src='" + asset_host + "javascripts/feedback-v2.js' type='text/javascript'%3E%3C/script%3E"));
+    :javascript
+        var feedback_widget_options = {};
 
+        feedback_widget_options.display = "overlay";  
+        feedback_widget_options.company = "diaspora";
+        feedback_widget_options.placement = "left";
+        feedback_widget_options.color = "#222";
+        feedback_widget_options.style = "idea";
+        var feedback_widget = new GSFN.feedback_widget(feedback_widget_options);