diff --git a/.cvsignore b/.cvsignore
index 2de721d..2239a68 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -13,3 +13,4 @@ ruby-1.8.5.tar.gz
 ruby-1.8.5-p2.tar.gz
 ruby-1.8.5-p12.tar.gz
 ruby-1.8.6.tar.bz2
+ruby-1.8.6-p36.tar.bz2
diff --git a/ruby.spec b/ruby.spec
index 155dd9d..72c5a4b 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -1,7 +1,7 @@
 %define manver		1.4.6
 %define	rubyxver	1.8
 %define	rubyver		1.8.6
-#%%define _patchlevel	12
+%define _patchlevel	36
 %define dotpatchlevel	%{?_patchlevel:.%{_patchlevel}}
 %define patchlevel	%{?_patchlevel:-p%{_patchlevel}}
 %define	sitedir		%{_libdir}/ruby/site_ruby
@@ -11,7 +11,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)
@@ -469,6 +469,10 @@ rm -rf tmp-ruby-docs
 %endif
 
 %changelog
+* Thu Jul 20 2007 Akira TAGOH <tagoh@redhat.com> - 1.8.6.36-1
+- New upstream release.
+  - Fix Etc::getgrgid to get the correct gid as requested. (#236647)
+
 * Wed Mar 28 2007 Akira TAGOH <tagoh@redhat.com> - 1.8.6-2
 - Fix search path breakage. (#234029)
 
diff --git a/sources b/sources
index 6037925..96dd4cd 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
-e558a0e00ae318d43bf6ff9af452bad2  ruby-1.8.6.tar.bz2
+eb7f25818cb6993839b38d1f21bd4ea1  ruby-1.8.6-p36.tar.bz2