diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 0633435e108bf40c0c9ec171a37e67b2349930e3..963226000d0975008b6abbfd825c9fbf623f66ea 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed that rails --version should have the return code of 0 (success) #4560 [blair@orcaware.com]
+
 * Install alias so Rails::InfoController is accessible at /rails_info. Closes #4546. [Nicholas Seckar]
 
 * Fixed that spawner should daemonize if running in repeat mode [DHH]
diff --git a/railties/bin/rails b/railties/bin/rails
index d83f5b8b8e6d0dd83b9d49f645336bb6a81b691b..ae0cc8adca2258785eb5051beacdaae617666072 100755
--- a/railties/bin/rails
+++ b/railties/bin/rails
@@ -2,7 +2,10 @@ require File.dirname(__FILE__) + '/../lib/ruby_version_check'
 Signal.trap("INT") { puts; exit }
 
 require File.dirname(__FILE__) + '/../lib/rails/version'
-abort "Rails #{Rails::VERSION::STRING}" if %w(--version -v).include? ARGV.first
+if %w(--version -v).include? ARGV.first
+  puts "Rails #{Rails::VERSION::STRING}"
+  exit(0)
+end
 
 freeze   = ARGV.any? { |option| %w(--freeze -f).include?(option) }
 app_path = ARGV.first
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index d5e0345dd5c0524315e9d0aa7ef176e35fec3dce..be194cd2b06bf3f243c60abab98d546781cc663b 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -91,7 +91,7 @@ def failsafe_response(output, status, exception = nil)
         begin
           output.write "Status: #{status}\r\n"
           output.write "Content-Type: text/plain\r\n\r\n"
-          output.write exception.to_s + "\r\n" + exception.backtrace.join("\r\n") if exception
+          output.write(exception.to_s + "\r\n" + exception.backtrace.join("\r\n")) if exception
         rescue Object
         end
       end