diff --git a/Gemfile b/Gemfile
index 83f03c8..f833b01 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,6 +10,6 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-# To use a debugger
-# gem 'byebug', group: [:development, :test]
-
+group :development do
+  gem "rubocop",  "0.32.0"
+end
diff --git a/Gemfile.lock b/Gemfile.lock
index 72725eb..a3525f4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -43,6 +43,9 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     arel (6.0.0)
+    ast (2.0.0)
+    astrolabe (1.3.0)
+      parser (>= 2.2.0.pre.3, < 3.0)
     builder (3.2.2)
     erubis (2.7.0)
     globalid (0.3.5)
@@ -58,6 +61,9 @@ GEM
     minitest (5.7.0)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
+    parser (2.2.2.5)
+      ast (>= 1.1, < 3.0)
+    powerpack (0.1.1)
     rack (1.6.1)
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -85,7 +91,15 @@ GEM
       activesupport (= 4.2.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.0.0)
     rake (10.4.2)
+    rubocop (0.32.0)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.2.5, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.7.5)
     sprockets (3.2.0)
       rack (~> 1.0)
     sprockets-rails (2.3.1)
@@ -102,6 +116,7 @@ PLATFORMS
 
 DEPENDENCIES
   diaspora_federation!
+  rubocop (= 0.32.0)
 
 BUNDLED WITH
    1.10.3