diff --git a/ruby.changes b/ruby.changes
index 6c15a8d..3c5d5a2 100644
--- a/ruby.changes
+++ b/ruby.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb  7 12:05:32 UTC 2014 - coolo@suse.com
+
+- reintroduce update-alternatives for rake,rdoc and ri as those
+  can come from more uptodate gems
+
 -------------------------------------------------------------------
 Sat Feb  1 11:51:30 UTC 2014 - coolo@suse.com
 
diff --git a/ruby.spec b/ruby.spec
index e75a8ac..1389653 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -92,6 +92,8 @@ Conflicts:      ruby18
 Conflicts:      ruby19
 Conflicts:      ruby20
 Requires:       ruby-stdlib
+PreReq:         update-alternatives
+BuildRequires:  update-alternatives
 
 Provides:       ruby-macros = %{rpm_macros_version}
 
@@ -336,6 +338,27 @@ install -D -m 0755 %{S:6} $RPM_BUILD_ROOT/usr/lib/rpm/gem_install.sh
 install -D -m 0755 %{S:1} $RPM_BUILD_ROOT/usr/lib/rpm/gem_build_cleanup.sh
 install -D -m 0755 %{S:7} $RPM_BUILD_ROOT/usr/lib/rpm/generate_buildrequires.sh
 
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives
+for bin in rake rdoc ri; do
+  # dummy
+  touch %{buildroot}%{_sysconfdir}/alternatives/$bin
+  mv %{buildroot}%_bindir/$bin %{buildroot}%_bindir/$bin.ruby
+  ln -s %{_sysconfdir}/alternatives/$bin %{buildroot}%_bindir/$bin
+done
+
+%post
+for bin in rake rdoc ri; do
+  /usr/sbin/update-alternatives --install \
+    %{_bindir}/$bin $bin %{_bindir}/$bin.ruby 2
+done
+
+%preun
+if [ "$1" = 0 ] ; then
+  for bin in rake rdoc ri; do
+    /usr/sbin/update-alternatives --remove $bin %{_bindir}/$bin.ruby
+  done
+fi
+
 %if 0%{?run_tests}
 
 %check
@@ -353,6 +376,9 @@ make check V=1 ||:
 %files
 %defattr(-,root,root,-)
 %config(noreplace) /etc/rpm/macros.ruby
+%ghost %{_sysconfdir}/alternatives/rake
+%ghost %{_sysconfdir}/alternatives/rdoc
+%ghost %{_sysconfdir}/alternatives/ri
 %{_bindir}/erb
 %{_bindir}/gem
 %{_bindir}/irb
@@ -361,6 +387,9 @@ make check V=1 ||:
 %{_bindir}/ri
 %{_bindir}/ruby
 %{_bindir}/testrb
+%{_bindir}/rake.ruby
+%{_bindir}/rdoc.ruby
+%{_bindir}/ri.ruby
 %if 0%{?tk_version_supported} > 0
 %exclude %{rb_libdir}/multi-tk.rb
 %exclude %{rb_libdir}/remote-tk.rb