diff --git a/ChangeLog b/ChangeLog
index 155157a7b1..9a50b743c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 30 22:00:44 2010  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/irb.rb: suppoort [Feature#988], [ruby-core:21177].
+	* lib/irb/context.rb: fix Context#verbose?.
+
 Tue Mar 30 21:56:33 2010  Tanaka Akira  <akr@fsij.org>
 
 	* time.c: make wide value more polymorphic.
diff --git a/lib/irb.rb b/lib/irb.rb
index d914f06a7a..7a9d438b5b 100644
--- a/lib/irb.rb
+++ b/lib/irb.rb
@@ -144,6 +144,8 @@ module IRB
 	      if @context.verbose?
 		printf "Use \"exit\" to leave %s\n", @context.ap_name
 	      end
+	    else
+	      print "\n"
 	    end
 	  end
 	  l
diff --git a/lib/irb/context.rb b/lib/irb/context.rb
index 497d7bf637..61b519170d 100644
--- a/lib/irb/context.rb
+++ b/lib/irb/context.rb
@@ -150,6 +150,8 @@ module IRB
 	else
 	  false
 	end
+      else
+	@verbose
       end
     end