diff --git a/.cvsignore b/.cvsignore
index af91bc1..cbaa24a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rubygems-1.2.0.tgz
+rubygems-1.3.1.tgz
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..2ce93ad
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+rubygems-1_3_1-1_fc9:F-10:rubygems-1.3.1-1.fc9.src.rpm:1229172680
diff --git a/no-rdoc.patch b/no-rdoc.patch
deleted file mode 100644
index b2fa89d..0000000
--- a/no-rdoc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- rubygems-0.9.1/post-install.rb.orig	2007-01-15 16:31:27.000000000 -0800
-+++ rubygems-0.9.1/post-install.rb	2007-02-26 12:13:54.000000000 -0800
-@@ -115,7 +115,6 @@
- 
- install_sources
- remove_old_rdoc
--install_rdoc
- install_windows_batch_files
- remove_stubs
- 
diff --git a/noarch-gemdir.patch b/noarch-gemdir.patch
deleted file mode 100644
index 3986c00..0000000
--- a/noarch-gemdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up rubygems-1.2.0/lib/rubygems/defaults.rb.orig rubygems-1.2.0/lib/rubygems/defaults.rb
---- rubygems-1.2.0/lib/rubygems/defaults.rb.orig	2008-06-04 19:34:47.000000000 -0700
-+++ rubygems-1.2.0/lib/rubygems/defaults.rb	2008-09-16 15:31:12.000000000 -0700
-@@ -15,7 +15,8 @@ module Gem
-       File.join ConfigMap[:libdir], RUBY_ENGINE, 'gems',
-                 ConfigMap[:ruby_version]
-     else
--      File.join ConfigMap[:libdir], 'ruby', 'gems', ConfigMap[:ruby_version]
-+      gemdir = File::expand_path(File::join(ConfigMap[:sitedir],"..","gems"))
-+      File.join(gemdir, ConfigMap[:ruby_version])
-     end
-   end
- 
diff --git a/rubygems-1.3.1-noarch-gemdir.patch b/rubygems-1.3.1-noarch-gemdir.patch
new file mode 100644
index 0000000..b429e7d
--- /dev/null
+++ b/rubygems-1.3.1-noarch-gemdir.patch
@@ -0,0 +1,14 @@
+diff -ur rubygems-1.3.1.orig/lib/rubygems/defaults.rb rubygems-1.3.1/lib/rubygems/defaults.rb
+--- rubygems-1.3.1.orig/lib/rubygems/defaults.rb	2008-10-10 22:29:53.000000000 +0200
++++ rubygems-1.3.1/lib/rubygems/defaults.rb	2008-11-09 01:02:33.000000000 +0100
+@@ -21,8 +21,8 @@
+       File.join File.dirname(ConfigMap[:sitedir]), 'Gems',
+                 ConfigMap[:ruby_version]
+     else
+-      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
+-                ConfigMap[:ruby_version])
++      gemdir = File::expand_path(File::join(ConfigMap[:sitedir],"..","gems"))
++      File.join(gemdir, ConfigMap[:ruby_version])
+     end
+   end
+ 
diff --git a/rubygems.spec b/rubygems.spec
index 127f5f8..ab3fa3a 100644
--- a/rubygems.spec
+++ b/rubygems.spec
@@ -5,14 +5,14 @@
 
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 1.2.0
-Release: 2%{?dist}
+Version: 1.3.1
+Release: 1%{?dist}
 Group: Development/Libraries
 # No GPL version is specified.
 License: Ruby or GPL+
 URL: http://rubyforge.org/projects/rubygems/
-Source0: http://rubyforge.org/frs/download.php/38646/rubygems-1.2.0.tgz
-Patch0: noarch-gemdir.patch
+Source0: http://rubyforge.org/frs/download.php/45905/rubygems-1.3.1.tgz
+Patch0: rubygems-1.3.1-noarch-gemdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 Requires: ruby(abi) = 1.8 ruby-rdoc
 BuildRequires:  ruby ruby-rdoc
@@ -38,8 +38,15 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-GEM_HOME=$RPM_BUILD_ROOT%{gem_home} \
-    ruby setup.rb --destdir=$RPM_BUILD_ROOT
+GEM_HOME=%{buildroot}/%{gem_home} \
+    ruby setup.rb --prefix=%{_prefix} \
+        --no-rdoc --no-ri \
+        --destdir=%{buildroot}/%{ruby_sitelib}/
+
+mkdir -p %{buildroot}/%{_bindir}
+mv %{buildroot}/%{ruby_sitelib}/bin/gem %{buildroot}/%{_bindir}/gem
+rm -rf %{buildroot}/%{ruby_sitelib}/bin
+mv %{buildroot}/%{ruby_sitelib}/lib/* %{buildroot}/%{ruby_sitelib}/.
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -48,16 +55,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, -)
 %doc README TODO ChangeLog
 %doc GPL.txt LICENSE.txt
+%dir %{gem_dir}
+%dir %{gem_home}
+%dir %{gem_home}/cache
+%dir %{gem_home}/gems
+%dir %{gem_home}/specifications
+%doc %{gem_home}/doc
 %{_bindir}/gem
-
-%{gem_dir}
-
-%{ruby_sitelib}/ubygems.rb
-%{ruby_sitelib}/rubygems.rb
-%{ruby_sitelib}/rubygems
-%{ruby_sitelib}/rbconfig
+%{ruby_sitelib}/*
 
 %changelog
+* Sun Nov 09 2008 Jeroen van Meeuwen <kanarip@kanarip.com> - 1.3.1-1
+- New upstream version
+
 * Tue Sep 16 2008 David Lutterkort <dlutter@redhat.com> - 1.2.0-2
 - Bump release because I forgot to check in newer patch
 
diff --git a/sources b/sources
index 999c22d..3baa6c1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b77a4234360735174d1692e6fc598402  rubygems-1.2.0.tgz
+a04ee6f6897077c5b75f5fd1e134c5a9  rubygems-1.3.1.tgz