diff --git a/Cask b/Cask
index b27878675..34e5d30bc 100644
--- a/Cask
+++ b/Cask
@@ -185,6 +185,7 @@
 (depends-on "inf-ruby")
 (depends-on "robe")
 (depends-on "company-inf-ruby")
+(depends-on "yard-mode")
 
 ;; Rust -- modules/module-rust.el
 (depends-on "rust-mode")
diff --git a/modules/module-ruby.el b/modules/module-ruby.el
index 9191f91c9..200971b84 100644
--- a/modules/module-ruby.el
+++ b/modules/module-ruby.el
@@ -23,6 +23,18 @@
   ;; Don't interfere with my custom RET behavior
   (define-key ruby-mode-map [?\n] nil)
 
+  (use-package yard-mode :init (add-hook 'ruby-mode-hook 'yard-mode))
+
+  (use-package robe
+    :commands (robe-mode robe-start ruby-load-file company-robe)
+    :init
+    (add-hook! ruby-mode
+      (narf|ruby-load-file)
+      (add-hook 'after-save-hook 'narf|ruby-load-file nil t))
+    :config
+    (require 'company-robe)
+    (define-company-backend! ruby-mode (robe)))
+
   (use-package ruby-refactor
     :init (add-hook 'ruby-mode-hook 'emr-initialize)
     :config
@@ -93,15 +105,5 @@
   (require 'company-inf-ruby)
   (define-company-backend! inf-ruby-mode (inf-ruby)))
 
-(use-package robe
-  :commands (robe-mode robe-start ruby-load-file)
-  :init
-  (add-hook! ruby-mode
-    (narf|ruby-load-file)
-    (add-hook 'after-save-hook 'narf|ruby-load-file nil t))
-  :config
-  (require 'company-robe)
-  (define-company-backend! ruby-mode (robe)))
-
 (provide 'module-ruby)
 ;;; module-ruby.el ends here