diff --git a/.cvsignore b/.cvsignore
index 2f8f041..309416f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rubygems-1.3.6.tgz
+rubygems-1.3.7.tgz
diff --git a/rubygems-1.3.5-noarch-gemdir.patch b/rubygems-1.3.5-noarch-gemdir.patch
deleted file mode 100644
index 1a18e2d..0000000
--- a/rubygems-1.3.5-noarch-gemdir.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- rubygems-1.3.5/lib/rubygems/defaults.rb.noarch	2009-06-23 07:54:36.000000000 +0900
-+++ rubygems-1.3.5/lib/rubygems/defaults.rb	2009-09-21 00:29:09.000000000 +0900
-@@ -25,8 +25,10 @@
-       File.join(ConfigMap[:libdir], ConfigMap[:ruby_install_name], '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])
-+#      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
-+#                ConfigMap[:ruby_version])
-     end
-   end
- 
diff --git a/rubygems-1.3.6-show-prefix-with-contents-by-default.patch b/rubygems-1.3.6-show-prefix-with-contents-by-default.patch
deleted file mode 100644
index b6b6148..0000000
--- a/rubygems-1.3.6-show-prefix-with-contents-by-default.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-2010-04-21  Eric Hodel  <drbrain@segment7.net>
-
-	* lib/rubygems/commands/contents_command.rb:  Make --prefix the
-	  default as specified in --help.  Bug #27211 by Mamoru Tasaka.
-
-Index: trunk/lib/rubygems/commands/contents_command.rb
-===================================================================
---- trunk/lib/rubygems/commands/contents_command.rb	(revision 2496)
-+++ trunk/lib/rubygems/commands/contents_command.rb	(revision 2497)
-@@ -7,7 +7,7 @@
- 
-   def initialize
-     super 'contents', 'Display the contents of the installed gems',
--          :specdirs => [], :lib_only => false
-+          :specdirs => [], :lib_only => false, :prefix => true
- 
-     add_version_option
- 
diff --git a/rubygems-1.3.7-noarch-gemdir.patch b/rubygems-1.3.7-noarch-gemdir.patch
new file mode 100644
index 0000000..83ccd00
--- /dev/null
+++ b/rubygems-1.3.7-noarch-gemdir.patch
@@ -0,0 +1,16 @@
+--- rubygems-1.3.7/lib/rubygems/defaults.rb.noarch	2010-04-20 14:57:27.000000000 +0900
++++ rubygems-1.3.7/lib/rubygems/defaults.rb	2010-05-17 16:47:18.000000000 +0900
+@@ -24,8 +24,11 @@
+       File.join(ConfigMap[:rubylibprefix], '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])
++#      File.join(ConfigMap[:libdir], ruby_engine, 'gems',
++#                ConfigMap[:ruby_version])
++
+     end
+   end
+ 
diff --git a/rubygems.spec b/rubygems.spec
index 7c36552..d308574 100644
--- a/rubygems.spec
+++ b/rubygems.spec
@@ -3,20 +3,18 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
-%define repoid 69365
+%define repoid 70696
 
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 1.3.6
+Version: 1.3.7
 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/%{repoid}/rubygems-%{version}.tgz
-Patch0: rubygems-1.3.5-noarch-gemdir.patch
-# Upstream bug 27211
-Patch1: rubygems-1.3.6-show-prefix-with-contents-by-default.patch
+Patch0: rubygems-1.3.7-noarch-gemdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 Requires: ruby(abi) = 1.8 ruby-rdoc
 BuildRequires:  ruby ruby-rdoc
@@ -30,7 +28,6 @@ libraries.
 %prep
 %setup -q
 %patch0 -p1 -b .noarch
-%patch1 -p1 -b .prefix_contents
 
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
@@ -75,7 +72,10 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/*
 
 %changelog
-* Wed Feb 28 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.3.6-1
+* Mon May 17 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.3.7-1
+- Update to 1.3.7, dropping upstreamed patch
+
+* Wed Apr 28 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.3.6-1
 - Update to 1.3.6
 - Show prefix with gem contents by default as shown in --help
 
diff --git a/sources b/sources
index 60eee80..0862ef6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-789ca8e9ad1d4d3fe5f0534fcc038a0d  rubygems-1.3.6.tgz
+e85cfadd025ff6ab689375adbf344bbe  rubygems-1.3.7.tgz