diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index 38f4cb1928e82e47e76b1bb225fce122e1dfb517..8d5c089558f92fc7c0a3e0660b40b02d7a1e73d2 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed CTRL-C exists from the Breakpointer to be a clean affair without error dumping [Kent Sibilev]
+
 * Fixed "rake stats" to work with sub-directories in models and controllers and to report the code to test ration [Scott Baron]
 
 * Added that Active Record associations are now reloaded instead of cleared to work with the new const_missing hook in Active Record.
diff --git a/railties/lib/breakpoint_client.rb b/railties/lib/breakpoint_client.rb
index 8a8bc755947ac11087d354d8797fd112227a0e60..fa93c11f3ebcd3aad4713be0f17bbfea63505acf 100644
--- a/railties/lib/breakpoint_client.rb
+++ b/railties/lib/breakpoint_client.rb
@@ -62,6 +62,10 @@
 
 options[:ServerURI] = ARGV[0] if ARGV[0]
 
+$running = true
+
+trap("INT"){$running = false}
+
 puts "Waiting for initial breakpoint..."
 
 loop do
@@ -138,7 +142,7 @@
 
       puts "Connection established. Waiting for breakpoint...", "" if options[:Verbose]
 
-      loop do
+      while $running
         begin
           service.ping
         rescue DRb::DRbConnError => error
@@ -152,6 +156,7 @@
       service.unregister_handler
     end
   rescue Exception => error
+    break unless $running
     if options[:RetryDelay] > 0 then
       puts "No connection to breakpoint service at #{options[:ServerURI]}:", "  (#{error.inspect})" if options[:Verbose]
       error.backtrace if $DEBUG