diff --git a/ruby-1.8.7-p358-CVE-2012-4466.patch b/ruby-1.8.7-p358-CVE-2012-4466.patch
new file mode 100644
index 0000000..3bcafa2
--- /dev/null
+++ b/ruby-1.8.7-p358-CVE-2012-4466.patch
@@ -0,0 +1,13 @@
+Backported fix for CVE-2012-4466 on trunk:rev37068 to 1.8.7 branch
+Mamoru Tasaka <mtasaka@fedoraproject.org>
+
+--- ruby-1.8.7-p358/error.c.sec	2011-02-18 21:32:35.000000000 +0900
++++ ruby-1.8.7-p358/error.c	2012-10-04 22:32:06.000000000 +0900
+@@ -757,7 +757,6 @@ name_err_mesg_to_str(obj)
+ 	args[2] = d;
+ 	mesg = rb_f_sprintf(3, args);
+     }
+-    if (OBJ_TAINTED(obj)) OBJ_TAINT(mesg);
+     return mesg;
+ }
+ 
diff --git a/ruby.spec b/ruby.spec
index 8e1128b..e1c2cdd 100644
--- a/ruby.spec
+++ b/ruby.spec
@@ -17,7 +17,7 @@
 
 Name:		ruby
 Version:	%{rubyver}%{?dotpatchlevel}
-Release:	2%{?dist}
+Release:	3%{?dist}
 # Please check if ruby upstream changes this to "Ruby or GPLv2+"
 License:	Ruby or GPLv2
 URL:		http://www.ruby-lang.org/
@@ -63,6 +63,8 @@ Patch33:	ruby-1.8.7-p249-mkmf-use-shared.patch
 # Remove duplicate path entry
 # bug 718695
 Patch34:	ruby-1.8.7-p352-path-uniq.patch
+# Backported fix for CVE-2012-4466 on trunk:rev37068 to 1.8.7 branch
+Patch35:	ruby-1.8.7-p358-CVE-2012-4466.patch
 # Change ruby load path to conform to Fedora/ruby
 # library placement (various 1.8.6 patches consolidated into this)
 Patch100:	ruby-1.8.7-lib-paths.patch
@@ -184,6 +186,7 @@ pushd %{name}-%{arcver}
 %patch29 -p1
 %patch33 -p1
 %patch34 -p1
+%patch35 -p1
 %patch100 -p1
 
 ( 
@@ -544,6 +547,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/ri
 
 %changelog
+* Thu Oct 04 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.8.7.358-3
+- Backport fix for CVE-2012-4466 on trunk:rev37068 to 1.8.7 branch
+
 * Sun Jun 16 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.8.7.358-2
 - Fix sed usage wrt shebang modification
   (Christian Iseli <Christian.Iseli@unil.ch>)