diff --git a/Gemfile b/Gemfile
index 6b848587a..3e76577d9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,6 +67,8 @@ gem 'jammit', '0.5.4'
 gem 'rest-client', '1.6.1'
 gem 'typhoeus'
 
+#Reporting
+gem 'hoptoad_notifier'
 gem 'newrelic_rpm', :require => false
 
 #Backups
diff --git a/Gemfile.lock b/Gemfile.lock
index 8b050498a..be463e192 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -211,6 +211,9 @@ GEM
     haml (3.1.2)
     hashie (1.0.0)
     highline (1.6.2)
+    hoptoad_notifier (2.4.11)
+      activesupport
+      builder
     http_connection (1.4.1)
     i18n (0.5.0)
     i18n-inflector (2.6.2)
@@ -477,6 +480,7 @@ DEPENDENCIES
   foreigner (= 0.9.1)
   fuubar
   haml (= 3.1.2)
+  hoptoad_notifier
   http_accept_language!
   i18n-inflector-rails (~> 1.0)
   jammit (= 0.5.4)
diff --git a/config/application.yml.example b/config/application.yml.example
index 8ce020ec1..d2bd7396e 100644
--- a/config/application.yml.example
+++ b/config/application.yml.example
@@ -138,6 +138,9 @@ defaults: &defaults
   featured_users:
     - 'diasporahq@joindiaspora.com'
 
+  #Hoptoad api key
+  hoptoad_api_key: ''
+
 # Use this section to override default settings in specific environments
 development:
   <<: *defaults
diff --git a/config/deploy.rb b/config/deploy.rb
index 1d090b2cc..4c00e9994 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -81,3 +81,6 @@ namespace :deploy do
 end
 
 after "deploy:symlink", "deploy:symlink_config_files", "deploy:symlink_cookie_secret", "deploy:bundle_static_assets"
+
+        require './config/boot'
+        require 'hoptoad_notifier/capistrano'
diff --git a/config/initializers/hoptoad.rb b/config/initializers/hoptoad.rb
new file mode 100644
index 000000000..7b219921b
--- /dev/null
+++ b/config/initializers/hoptoad.rb
@@ -0,0 +1,5 @@
+if AppConfig[:hoptoad_api_key].present?
+  HoptoadNotifier.configure do |config|
+    config.api_key = AppConfig[:hoptoad_api_key]
+  end
+end