diff --git a/Gemfile b/Gemfile
index 26435ea..0015af5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,8 +29,7 @@ gem 'spring',        group: :development
 # add annotations of schema inside models
 gem 'annotate'
 
-# Use unicorn as the app server
-# gem 'unicorn'
+gem 'airbrake'
 
 # Deployment
 gem 'capistrano', '~> 3.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index fb566ce..85e53aa 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -37,6 +37,9 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     addressable (2.3.7)
+    airbrake (4.1.0)
+      builder
+      multi_json
     annotate (2.6.5)
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
@@ -265,6 +268,7 @@ PLATFORMS
   x64-mingw32
 
 DEPENDENCIES
+  airbrake
   annotate
   bootstrap-sass (= 3.2.0.0)
   bootstrap-will_paginate (= 0.0.10)
diff --git a/config/initializers/errbit.rb b/config/initializers/errbit.rb
new file mode 100644
index 0000000..f7037bf
--- /dev/null
+++ b/config/initializers/errbit.rb
@@ -0,0 +1,6 @@
+Airbrake.configure do |config|
+  config.api_key = '6a6aacac3413e9c7b49b18c913477e4a'
+  config.host    = 'zeus-errbit.ilion.me'
+  config.port    = 80
+  config.secure  = config.port == 443
+end