diff --git a/.cvsignore b/.cvsignore
index ded56df..e796d3f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -11,3 +11,4 @@ ruby-1.8.4-preview2.tar.gz
 ruby-1.8.4.tar.gz
 ruby-1.8.5.tar.gz
 ruby-1.8.5-p2.tar.gz
+ruby-1.8.5-p12.tar.gz
diff --git a/ruby-rubyprefix.patch b/ruby-rubyprefix.patch
index 452ef2f..1b01f3a 100644
--- a/ruby-rubyprefix.patch
+++ b/ruby-rubyprefix.patch
@@ -1,7 +1,7 @@
-diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
---- ruby-1.8.4.orig/configure.in	2006-04-19 21:54:44.000000000 +0900
-+++ ruby-1.8.4/configure.in	2006-04-19 21:59:48.000000000 +0900
-@@ -1433,6 +1433,13 @@
+diff -ruN ruby-1.8.5-p12.orig/configure.in ruby-1.8.5-p12/configure.in
+--- ruby-1.8.5-p12.orig/configure.in	2006-12-06 19:58:08.000000000 +0900
++++ ruby-1.8.5-p12/configure.in	2007-02-05 17:02:43.000000000 +0900
+@@ -1505,6 +1505,13 @@
      rubyw_install_name="$RUBYW_INSTALL_NAME"
      ;;
  esac
@@ -15,7 +15,7 @@ diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
  case "$target_os" in
    cygwin*|mingw*|*djgpp*|os2-emx*)
      RUBY_LIB_PREFIX="/lib/ruby"
-@@ -1441,21 +1448,30 @@
+@@ -1513,20 +1520,29 @@
      RUBY_LIB_PREFIX="${prefix}/lib/ruby"
      ;;
  esac
@@ -29,11 +29,11 @@ diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
  	    [  --with-sitedir=DIR      site libraries in DIR [PREFIX/lib/ruby/site_ruby]],
              [sitedir=$withval],
              [sitedir='${prefix}/lib/ruby/site_ruby'])
--SITE_DIR="`eval \"echo ${sitedir}\"`"
-+SITE_DIR="`eval \"echo ${sitedir}\" | sed -e s/lib64/lib/`"
+-SITE_DIR=`eval echo \\"${sitedir}\\"`
++SITE_DIR=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
 +_fc_sitedir="\$(DESTDIR)${sitedir}"
-+SITE_DIR2="`eval \"echo ${_fc_sitedir}\"`"
-+sitedir="`eval \"echo ${sitedir}\" | sed -e s/lib64/lib/`"
++SITE_DIR2=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
++sitedir=`eval echo \\"${sitedir}\\" | sed -e "s/lib64/lib/"`
  case "$target_os" in
    cygwin*|mingw*|*djgpp*|os2-emx*)
      RUBY_SITE_LIB_PATH="`expr "$SITE_DIR" : "$prefix\(/.*\)"`" ||
@@ -47,8 +47,7 @@ diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
  RUBY_SITE_LIB_PATH2="${RUBY_SITE_LIB_PATH}/${MAJOR}.${MINOR}"
  
  AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB_PATH}")
- AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
-@@ -1464,6 +1480,7 @@
+@@ -1536,6 +1552,7 @@
  AC_SUBST(arch)dnl
  AC_SUBST(sitearch)dnl
  AC_SUBST(sitedir)dnl
@@ -56,7 +55,7 @@ diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
  
  configure_args=$ac_configure_args
  AC_SUBST(configure_args)dnl
-@@ -1472,7 +1489,7 @@
+@@ -1544,7 +1561,7 @@
      arch="fat-${target_os}"
  
      AC_DEFINE_UNQUOTED(RUBY_THIN_ARCHLIB,
@@ -65,7 +64,7 @@ diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
  
      AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
                   "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
-@@ -1487,8 +1504,8 @@
+@@ -1559,8 +1576,8 @@
    *) sitearch="${arch}" ;;
  esac
  
@@ -76,9 +75,9 @@ diff -ruN ruby-1.8.4.orig/configure.in ruby-1.8.4/configure.in
  
  AC_ARG_WITH(search-path,
  		[  --with-search-path=DIR specify the additional search path],
-diff -ruN ruby-1.8.4.orig/mkconfig.rb ruby-1.8.4/mkconfig.rb
---- ruby-1.8.4.orig/mkconfig.rb	2005-11-11 08:22:03.000000000 +0900
-+++ ruby-1.8.4/mkconfig.rb	2006-04-19 21:55:08.000000000 +0900
+diff -ruN ruby-1.8.5-p12.orig/mkconfig.rb ruby-1.8.5-p12/mkconfig.rb
+--- ruby-1.8.5-p12.orig/mkconfig.rb	2006-06-25 23:03:10.000000000 +0900
++++ ruby-1.8.5-p12/mkconfig.rb	2007-02-05 16:54:32.000000000 +0900
 @@ -108,10 +108,10 @@
  print v_fast, v_others
  print <<EOS
diff --git a/ruby.spec b/ruby.spec
index 21dd129..0460b17 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,7 +1,7 @@
 %define manver		1.4.6
 %define	rubyxver	1.8
 %define	rubyver		1.8.5
-%define _patchlevel	2
+%define _patchlevel	12
 %define dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %define patchlevel	%{?_patchlevel:-p%{_patchlevel}}
 %define	sitedir		%{_libdir}/ruby/site_ruby
@@ -9,7 +9,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	2%{?dist}
+Release:	1%{?dist}
 License:	Ruby License/GPL - see COPYING
 URL:		http://www.ruby-lang.org/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,7 +30,6 @@ Source5:	irb.1
 Source10:	ruby-mode-init.el
 
 Patch1:		ruby-1.8.2-deadcode.patch
-Patch2:		ruby-1.8.5-hash-memory-leak.patch
 Patch20:	ruby-rubyprefix.patch
 Patch21:	ruby-deprecated-sitelib-search-path.patch
 Patch22:	ruby-deprecated-search-path.patch
@@ -147,7 +146,6 @@ tar fxz %{SOURCE2}
 popd
 pushd %{name}-%{rubyver}%{?patchlevel}
 %patch1 -p1
-%patch2 -p1
 %patch20 -p1
 %patch21 -p1
 %ifarch ppc64 s390x sparc64 x86_64
@@ -463,8 +461,8 @@ rm -rf tmp-ruby-docs
 %endif
 
 %changelog
-* Mon Feb  5 2007 Akira TAGOH <tagoh@redhat.com> - 1.8.5.2-2
-- rebuild
+* Mon Feb  5 2007 Akira TAGOH <tagoh@redhat.com> - 1.8.5.12-1
+- New upstream release.
 
 * Mon Dec 11 2006 Akira TAGOH <tagoh@redhat.com> - 1.8.5.2-1
 - security fix release.
diff --git a/sources b/sources
index cd8fe8f..423844b 100644
--- a/sources
+++ b/sources
@@ -2,4 +2,4 @@
 d65e3a216d6d345a2a6f1aa8758c2f75  ruby-refm-rdp-1.8.1-ja-html.tar.gz
 7f3e181c0be9a1579e43a5a8b26372d6  rubyfaq-990927.tar.bz2
 8aa2e2da327dc43ff6e46e634eb657b6  rubyfaq-jp-990927.tar.bz2
-a3517a224716f79b14196adda3e88057  ruby-1.8.5-p2.tar.gz
+d7d12dd9124c9b7d55cdbbee313e3931  ruby-1.8.5-p12.tar.gz