diff --git a/.cvsignore b/.cvsignore
index cbaa24a..5552275 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-rubygems-1.3.1.tgz
+rubygems-1.3.5.tgz
diff --git a/rubygems-1.3.1-noarch-gemdir.patch b/rubygems-1.3.1-noarch-gemdir.patch
deleted file mode 100644
index b429e7d..0000000
--- a/rubygems-1.3.1-noarch-gemdir.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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-1.3.5-noarch-gemdir.patch b/rubygems-1.3.5-noarch-gemdir.patch
new file mode 100644
index 0000000..1a18e2d
--- /dev/null
+++ b/rubygems-1.3.5-noarch-gemdir.patch
@@ -0,0 +1,15 @@
+--- 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.spec b/rubygems.spec
index e29e697..c49ff9e 100644
--- a/rubygems.spec
+++ b/rubygems.spec
@@ -3,16 +3,18 @@
 %define gem_home %{gem_dir}/%{rb_ver}
 %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 
+%define repoid 60718
+
 Summary: The Ruby standard for packaging ruby libraries
 Name: rubygems
-Version: 1.3.1
-Release: 3%{?dist}
+Version: 1.3.5
+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/45905/rubygems-1.3.1.tgz
-Patch0: rubygems-1.3.1-noarch-gemdir.patch
+Source0: http://rubyforge.org/frs/download.php/%{repoid}/rubygems-%{version}.tgz
+Patch0: rubygems-1.3.5-noarch-gemdir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
 Requires: ruby(abi) = 1.8 ruby-rdoc
 BuildRequires:  ruby ruby-rdoc
@@ -25,7 +27,7 @@ libraries.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .noarch
 
 # Some of the library files start with #! which rpmlint doesn't like
 # and doesn't make much sense
@@ -39,7 +41,7 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 GEM_HOME=%{buildroot}/%{gem_home} \
-    ruby setup.rb --prefix=%{_prefix} \
+    ruby setup.rb --prefix=/ \
         --no-rdoc --no-ri \
         --destdir=%{buildroot}/%{ruby_sitelib}/
 
@@ -53,7 +55,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-, root, root, -)
-%doc README TODO ChangeLog
+%doc README ChangeLog
+%doc History.txt
 %doc GPL.txt LICENSE.txt
 %dir %{gem_dir}
 %dir %{gem_home}
@@ -65,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT
 %{ruby_sitelib}/*
 
 %changelog
+* Mon Sep 21 2009 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.3.5-1
+- Update to 1.3.5
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 3baa6c1..431d00e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a04ee6f6897077c5b75f5fd1e134c5a9  rubygems-1.3.1.tgz
+6e317335898e73beab15623cdd5f8cff  rubygems-1.3.5.tgz