diff --git a/.gitignore b/.gitignore
index 614e3fbf1..37e414d99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ anaconda-mode/
 flycheck_*.el*
 /projectile.cache
 *.log
+eshell/
diff --git a/lisp/init-package.el b/lisp/init-package.el
index a3baa6ac8..4a95054ab 100644
--- a/lisp/init-package.el
+++ b/lisp/init-package.el
@@ -102,7 +102,7 @@
  'anaconda-mode 'py-autopep8
 
  ;; ruby
- 'enh-ruby-mode 'robe 'inf-ruby 'yaml-mode 'yard-mode 'yari
+ 'enh-ruby-mode 'robe 'inf-ruby 'rubocop 'yaml-mode 'yard-mode 'yari
 
  ;; scm
  'magit 'psvn
diff --git a/lisp/init-ruby.el b/lisp/init-ruby.el
index 910979c11..22d892f40 100644
--- a/lisp/init-ruby.el
+++ b/lisp/init-ruby.el
@@ -76,6 +76,9 @@
 (eval-after-load 'company
   '(push 'company-robe company-backends))
 
+;; Rubocop
+(add-hook 'enh-ruby-mode-hook #'rubocop-mode)
+
 ;; YAML mode
 (add-hook 'yaml-mode-hook
           '(lambda ()