diff --git a/ChangeLog b/ChangeLog
index f660b83ddc..99762a03e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Dec 23 15:25:00 2012  Zachary Scott  <zachary@zacharyscott.net>
+
+	* lib/irb/ruby-lex.rb: Add handling for %i and %I quoting to irb
+	  Patch by flori [ruby-core:49550] [Bug #7392] [Github Issue #157]
+
 Sun Dec 23 15:05:48 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_eval.c (rb_check_funcall_with_hook): rb_check_funcall with hook
diff --git a/lib/irb/ruby-lex.rb b/lib/irb/ruby-lex.rb
index 068a672d40..379b4b746d 100644
--- a/lib/irb/ruby-lex.rb
+++ b/lib/irb/ruby-lex.rb
@@ -312,6 +312,8 @@ class RubyLex
     "r" => "/",
     "w" => "]",
     "W" => "]",
+    "i" => "]",
+    "I" => "]",
     "s" => ":"
   }