diff --git a/ChangeLog b/ChangeLog
index f480da8650..62f4dfdd8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 13 06:50:31 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/net/protocol.rb (Net::BufferedIO#rbuf_fill): TimeoutError is
+	  obsolete, use Timeout::Error instead.  [ruby-core:23821]
+
 Sat Jun 13 06:45:46 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_eval.c (rb_f_throw): fixed rdoc about execption.
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index d927c52f34..2a6cfb4f61 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -137,7 +137,7 @@ module Net # :nodoc:
         if IO.select([@io], nil, nil, @read_timeout)
           retry
         else
-          raise Timeout::TimeoutError
+          raise Timeout::Error
         end
       rescue IO::WaitWritable
         # OpenSSL::Buffering#read_nonblock may fail with IO::WaitWritable.
@@ -145,7 +145,7 @@ module Net # :nodoc:
         if IO.select(nil, [@io], nil, @read_timeout)
           retry
         else
-          raise Timeout::TimeoutError
+          raise Timeout::Error
         end
       end
     end