diff --git a/rpm-5.4.4-ruby1.9-fixes.patch b/rpm-5.4.9-ruby1.9-fixes.patch
similarity index 82%
rename from rpm-5.4.4-ruby1.9-fixes.patch
rename to rpm-5.4.9-ruby1.9-fixes.patch
index bfd5780..2c0ae90 100644
--- a/rpm-5.4.4-ruby1.9-fixes.patch
+++ b/rpm-5.4.9-ruby1.9-fixes.patch
@@ -1,5 +1,6 @@
---- rpm-5.4.4/macros/ruby.in.ruby19~	2012-02-12 02:12:46.836859413 +0100
-+++ rpm-5.4.4/macros/ruby.in	2012-02-12 02:15:46.629035339 +0100
+diff -urN rpm-5.4.9/macros/ruby.in rpm-5.4.9-patched/macros/ruby.in
+--- rpm-5.4.9/macros/ruby.in	2011-10-15 23:56:57.000000000 +1100
++++ rpm-5.4.9-patched/macros/ruby.in	2012-08-30 18:09:09.732009037 +1100
 @@ -2,7 +2,7 @@
  # To make use of these macros insert the following line into your spec file:
  # %{load:%{_usrlibrpm}/macros.d/ruby}
@@ -39,12 +40,17 @@
  
  %__gem_helper %{_usrlibrpm}/gem_helper.rb
  
---- rpm-5.4.4/scripts/gem_helper.rb.ruby19~	2012-02-10 18:11:51.651949530 +0100
-+++ rpm-5.4.4/scripts/gem_helper.rb	2012-02-12 02:09:01.918636768 +0100
-@@ -60,7 +60,11 @@ if ARGV[0] == "build" or ARGV[0] == "ins
-   file_data = Zlib::GzipReader.open("metadata.gz")
+diff -urN rpm-5.4.9/scripts/gem_helper.rb rpm-5.4.9-patched/scripts/gem_helper.rb
+--- rpm-5.4.9/scripts/gem_helper.rb	2010-10-16 20:58:48.000000000 +1100
++++ rpm-5.4.9-patched/scripts/gem_helper.rb	2012-08-30 18:12:11.233007114 +1100
+@@ -57,10 +57,13 @@
+     argv.delete_at(0)
+   end
+ 
+-  file_data = Zlib::GzipReader.open("metadata.gz")
++  file_data = Zlib::GzipReader.open("metadata.gz") {|io| io.read}
    header = YAML::load(file_data)
-   file_data.close()
+-  file_data.close()
 -  body = header.instance_variable_get :@ivars
 +  body = {}
 +  # I don't know any better.. :/
@@ -54,9 +60,10 @@
  
    require 'rubygems'
    spec = Gem::Specification.from_yaml(YAML.dump(header))
---- rpm-5.4.4/scripts/rubygems.rb.ruby19~	2012-02-10 18:13:31.677929922 +0100
-+++ rpm-5.4.4/scripts/rubygems.rb	2012-02-10 18:29:59.496622154 +0100
-@@ -30,7 +30,7 @@ if rest.size != 0 or (!provides and !req
+diff -urN rpm-5.4.9/scripts/rubygems.rb rpm-5.4.9-patched/scripts/rubygems.rb
+--- rpm-5.4.9/scripts/rubygems.rb	2011-04-01 18:30:28.000000000 +1100
++++ rpm-5.4.9-patched/scripts/rubygems.rb	2012-08-30 18:09:09.771009037 +1100
+@@ -30,7 +30,7 @@
    exit(1)
  end
  
@@ -65,7 +72,7 @@
  gems = []
  ruby_versioned = false
  abi_provide = false
-@@ -44,17 +44,17 @@ for path in $stdin.readlines
+@@ -44,17 +44,17 @@
    # package is dependent on this specific version.
    # FIXME: only supports current ruby version
    elsif not ruby_versioned
@@ -87,7 +94,7 @@
        ruby_versioned = true
      end
    end
-@@ -63,7 +63,7 @@ end
+@@ -63,7 +63,7 @@
  if requires or abi_provide
    print "ruby(abi)"
    if ruby_versioned
@@ -96,7 +103,7 @@
    end
  end
  
-@@ -105,7 +105,7 @@ if gems.length > 0
+@@ -105,7 +105,7 @@
      end
      if requires
        for d in spec.dependencies
diff --git a/rpm.spec b/rpm.spec
index dee6a11..e1eae7b 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -61,7 +61,7 @@ Name:		rpm
 Epoch:		1
 Version:	%{libver}.%{minorver}
 License:	LGPLv2.1+
-Release:	8
+Release:	9
 Group:		System/Configuration/Packaging
 URL:		http://rpm5.org/
 # snapshot from rpm-5_4 branch: 'cvs -d :pserver:anonymous@rpm5.org:/cvs co -r rpm-5_4 rpm'
@@ -189,7 +189,7 @@ Patch76:	rpm-5.4.4-file-listed-twice-terminates-build-with-rpmlint.patch
 # status: don't merge
 Patch77:	rpm-5.4.7-use-bdb-5.2.patch
 # status: probably okay to merge
-Patch78:	rpm-5.4.4-ruby1.9-fixes.patch
+Patch78:	rpm-5.4.9-ruby1.9-fixes.patch
 # mdvbz#65269
 # status: same as for other dependency generation patches
 Patch79:	rpm-5.4.4-dont-consider-ranged-dependencies-as-overlapping-for-removal.patch