diff --git a/operating_system.rb b/operating_system.rb
index 7b3930e..4055ed5 100644
--- a/operating_system.rb
+++ b/operating_system.rb
@@ -39,6 +39,15 @@ module Gem
     end
 
     ##
+    # Remove methods we are going to override. This avoids "method redefined;"
+    # warnings otherwise issued by Ruby.
+
+    remove_method :default_dir if method_defined? :default_dir
+    remove_method :default_path if method_defined? :default_path
+    remove_method :default_bindir if method_defined? :default_bindir
+    remove_method :default_ext_dir_for if method_defined? :default_ext_dir_for
+
+    ##
     # RubyGems default overrides.
 
     def default_dir
diff --git a/ruby.spec b/ruby.spec
index ceb1327..86be561 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -26,7 +26,7 @@
 %endif
 
 
-%global release 2
+%global release 3
 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}}
 
 %global ruby_libdir %{_datadir}/%{name}
@@ -863,6 +863,10 @@ make check TESTS="-v $DISABLE_TESTS"
 %{ruby_libdir}/tkextlib
 
 %changelog
+* Tue Mar 05 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.0-3
+- Avoid "method redefined;" warnings due to modified operating_system.rb.
+- Fix strange paths created during build of binary gems.
+
 * Mon Feb 25 2013 Vít Ondruch <vondruch@redhat.com> - 2.0.0.0-2
 - Prevent squash of %%gem_install with following line.
 
diff --git a/rubygems-2.0.0-binary-extensions.patch b/rubygems-2.0.0-binary-extensions.patch
index d826472..fa30892 100644
--- a/rubygems-2.0.0-binary-extensions.patch
+++ b/rubygems-2.0.0-binary-extensions.patch
@@ -337,7 +337,7 @@ index d7d953f..812c20c 100644
      mf = mf.gsub(/\s*\S+\.time$/, "")
  
 +    # Folder creation was dropped in r37016 for some reasons :/
-+    target_prefix = mf[/^target_prefix\s*=\s*(.*)/, 1]
++    target_prefix = mf[/^target_prefix\s*=[^\S\n]*(.*)$/, 1]
 +    FileUtils.mkdir_p File.join(dest_path, target_prefix) rescue nil # in case of perms issues -- lame
 +
      File.open('Makefile', 'wb') {|f| f.print mf}