diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index d6311f77a0a30061b361f51edbf4b27293558fd4..66e0d5e9c52c38e5cff31ea799ac0d55f535905c 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *Edge*
 
+* Fixed that the debugger wouldn't go into IRB mode because of left-over ARGVs [DHH]
+
 * I18n support for plugins.  #2325 [Antonio Tapiador, Sven Fuchs]
 
 * Ruby 1.9: use UTF-8 for default internal and external encodings.  [Jeremy Kemper]
diff --git a/railties/lib/rails/rack/debugger.rb b/railties/lib/rails/rack/debugger.rb
index aa2711c6167a9760bc704557023e0eb53df4a4ae..0a7b405553485aec0273f453e8a5ff440816fe33 100644
--- a/railties/lib/rails/rack/debugger.rb
+++ b/railties/lib/rails/rack/debugger.rb
@@ -4,6 +4,8 @@ class Debugger
       def initialize(app)
         @app = app
 
+        ARGV.clear # clear ARGV so that script/server options aren't passed to IRB
+
         require_library_or_gem 'ruby-debug'
         ::Debugger.start
         ::Debugger.settings[:autoeval] = true if ::Debugger.respond_to?(:settings)