5 files changed, 23 insertions, 10 deletions
diff --git a/Library/Formula/rbenv-bundler.rb b/Library/Formula/rbenv-bundler.rb
index 34196313a..d4374c2b8 100644
--- a/Library/Formula/rbenv-bundler.rb
+++ b/Library/Formula/rbenv-bundler.rb
@@ -9,15 +9,7 @@ class RbenvBundler < Formula
 
   def install
     prefix.install Dir['*']
-  end
-
-  def caveats; <<-EOS.undent
-      To enable rbenv bundler create an rbenv plugins folder:
-        mkdir $HOME/.rbenv/plugins
-
-      And symlink the rbenv-bundler plugin:
-        ln -s #{prefix} $HOME/.rbenv/plugins/bundler
 
-      EOS
+    ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/#{name}"
   end
 end
diff --git a/Library/Formula/rbenv-gemset.rb b/Library/Formula/rbenv-gemset.rb
index b8e2af95b..056afa278 100644
--- a/Library/Formula/rbenv-gemset.rb
+++ b/Library/Formula/rbenv-gemset.rb
@@ -11,5 +11,7 @@ class RbenvGemset < Formula
 
   def install
     prefix.install Dir['*']
+
+    ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/#{name}"
   end
 end
diff --git a/Library/Formula/rbenv-vars.rb b/Library/Formula/rbenv-vars.rb
index 4b9981872..29dda1fa4 100644
--- a/Library/Formula/rbenv-vars.rb
+++ b/Library/Formula/rbenv-vars.rb
@@ -11,5 +11,7 @@ class RbenvVars < Formula
 
   def install
     prefix.install Dir['*']
+
+    ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/#{name}"
   end
 end
diff --git a/Library/Formula/rbenv.rb b/Library/Formula/rbenv.rb
index a07d43fab..18b4b038f 100644
--- a/Library/Formula/rbenv.rb
+++ b/Library/Formula/rbenv.rb
@@ -9,11 +9,21 @@ class Rbenv < Formula
 
   def install
     prefix.install Dir['*']
+
+    var_lib = "#{HOMEBREW_PREFIX}/var/lib/rbenv/"
+    ['plugins', 'versions'].each do |dir|
+      var_dir = "#{var_lib}/#{dir}"
+      mkdir_p var_dir
+      ln_sf var_dir, "#{prefix}/#{dir}"
+    end
   end
 
   def caveats; <<-EOS.undent
-    To enable shims and autocompletion, add rbenv init to your profile:
+    To enable shims and autocompletion add to your profile:
       if which rbenv > /dev/null; then eval "$(rbenv init -)"; fi
+
+    To use Homebrew's directories rather than ~/.rbenv add to your profile:
+      export RBENV_ROOT=#{opt_prefix}
     EOS
   end
 end
diff --git a/Library/Formula/ruby-build.rb b/Library/Formula/ruby-build.rb
index c787cbf9d..e7fb264a7 100644
--- a/Library/Formula/ruby-build.rb
+++ b/Library/Formula/ruby-build.rb
@@ -7,8 +7,15 @@ class RubyBuild < Formula
 
   head 'https://github.com/sstephenson/ruby-build.git'
 
+  option "without-rbenv", "Don't install as an rbenv plugin"
+
+  depends_on 'rbenv' unless build.include? 'without-rbenv'
+
   def install
     ENV['PREFIX'] = prefix
     system "./install.sh"
+
+    ln_sf opt_prefix, "#{HOMEBREW_PREFIX}/var/lib/rbenv/plugins/ruby-build" \
+      unless build.include? 'without-rbenv'
   end
 end