diff --git a/ChangeLog b/ChangeLog
index 468ecd8333..ac165f47ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Aug  3 18:25:08 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* sample/svr.rb: obsolete TCPserver renamed.  [ruby-core:24712]
+
+	* sample/tsvr.rb: ditto.
+
+	* sample/dualstack-httpd.rb: ditto.
+
 Mon Aug  3 18:12:54 2009  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* thread.c (recursive_push): untrust internal hash to prevent
diff --git a/sample/dualstack-httpd.rb b/sample/dualstack-httpd.rb
index 69e3181863..11c5201d74 100644
--- a/sample/dualstack-httpd.rb
+++ b/sample/dualstack-httpd.rb
@@ -12,7 +12,7 @@ names = []
 threads = []
 
 res.each do |i|
-  s = TCPserver.new(i[3], i[1])
+  s = TCPServer.new(i[3], i[1])
   n = Socket.getnameinfo(s.getsockname, Socket::NI_NUMERICHOST|Socket::NI_NUMERICSERV).join(" port ")
   sockpool.push s
   names.push n
diff --git a/sample/svr.rb b/sample/svr.rb
index 11cfc5fbfe..f4f29eb8e7 100644
--- a/sample/svr.rb
+++ b/sample/svr.rb
@@ -6,7 +6,7 @@
 
 require "socket"
 
-gs = TCPserver.open(0)
+gs = TCPServer.open(0)
 addr = gs.addr
 addr.shift
 printf("server is on %s\n", addr.join(":"))
diff --git a/sample/tsvr.rb b/sample/tsvr.rb
index 52cdd32dce..2fa6c87ef9 100644
--- a/sample/tsvr.rb
+++ b/sample/tsvr.rb
@@ -3,7 +3,7 @@
 
 require "socket"
 
-gs = TCPserver.open(0)
+gs = TCPServer.open(0)
 addr = gs.addr
 addr.shift
 printf("server is on %s\n", addr.join(":"))