diff --git a/fish/config.fish b/fish/config.fish
index 9a9fb68..028ad2c 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -8,6 +8,11 @@ set -g -x EDITOR "emacsclient"
 # Add ~/bin to PATH
 set -g -x PATH ~/bin $PATH
 
+# Machine-local config
+if test -e ~/.config/fish/local.fish
+  source ~/.config/fish/local.fish
+end
+
 # =========
 # Functions
 # =========
diff --git a/gemrc b/gemrc
index 1c0377d..58d924e 100644
--- a/gemrc
+++ b/gemrc
@@ -1,2 +1,2 @@
-install: --no-rdoc
-update: --no-rdoc
\ No newline at end of file
+install: --no-rdoc --no-ri
+update: --no-rdoc --no-ri
diff --git a/spacemacs b/spacemacs
index e8f0dde..d6c34f6 100644
--- a/spacemacs
+++ b/spacemacs
@@ -22,6 +22,7 @@
           org
           shell
           shell-scripts
+          ruby
           ;; syntax-checking
           version-control
           ))
@@ -161,6 +162,9 @@ before layers configuration."
    ;; specified with an installed package.
    ;; Not used for now.
    dotspacemacs-default-package-repository nil
+   ;; Ruby version manager
+   ruby-version-manager 'rbenv
+   ruby-enable-ruby-on-rails-support t
    )
   ;; User initialization goes here
   (add-to-list 'default-frame-alist '(height . 50))