diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index dd354d886cc43ba5f60505018e83c8c7b1d97848..f655ecbedef79a41a9bb6cb83e7cfeacb4b3ea38 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* request.remote_ip understands X-Forwarded-For addresses with nonstandard whitespace.  #7386 [moses]
+
 * Don't prepare response when rendering a component.  #8493 [jsierles]
 
 * Reduce file stat calls when checking for template changes.  #7736 [alex]
diff --git a/actionpack/lib/action_controller/request.rb b/actionpack/lib/action_controller/request.rb
index caab289acd2b06df7378fa991f67dbe37087a1ac..2f0e86d2a2311e1c9cb369fd243160dd2d0fc2d8 100755
--- a/actionpack/lib/action_controller/request.rb
+++ b/actionpack/lib/action_controller/request.rb
@@ -112,7 +112,7 @@ def remote_ip
 
       if @env.include? 'HTTP_X_FORWARDED_FOR' then
         remote_ips = @env['HTTP_X_FORWARDED_FOR'].split(',').reject do |ip|
-            ip =~ /^unknown$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\./i
+          ip.strip =~ /^unknown$|^(10|172\.(1[6-9]|2[0-9]|30|31)|192\.168)\./i
         end
 
         return remote_ips.first.strip unless remote_ips.empty?
diff --git a/actionpack/test/controller/request_test.rb b/actionpack/test/controller/request_test.rb
index 1e6f6db8d8f079c60851060c7eca2aec896586f3..e14036fd2f48eb887e6e6d4c5d9f7ad3de9f1975 100644
--- a/actionpack/test/controller/request_test.rb
+++ b/actionpack/test/controller/request_test.rb
@@ -29,6 +29,9 @@ def test_remote_ip
 
     @request.env['HTTP_X_FORWARDED_FOR'] = '10.0.0.1,3.4.5.6'
     assert_equal '3.4.5.6', @request.remote_ip
+    
+    @request.env['HTTP_X_FORWARDED_FOR'] = '10.0.0.1, 10.0.0.1, 3.4.5.6'
+    assert_equal '3.4.5.6', @request.remote_ip
 
     @request.env['HTTP_X_FORWARDED_FOR'] = '127.0.0.1,3.4.5.6'
     assert_equal '127.0.0.1', @request.remote_ip