diff --git a/ChangeLog b/ChangeLog
index 07097775f2..52200987f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Oct  4 12:44:45 2003  akira yamada <akira@ruby-lang.org>
+
+	* lib/uri/ftp.rb, lib/uri/mailto.rb: renamed to #to_s from #to_str.
+
 Sat Oct  4 07:33:00 2003  Nathaniel Talbott  <ntalbott@ruby-lang.org>
 
 	* lib/test/unit/testsuite.rb: changed #<< to return self, and added
diff --git a/lib/uri.rb b/lib/uri.rb
index dec18a110b..fe1fdbe571 100644
--- a/lib/uri.rb
+++ b/lib/uri.rb
@@ -15,7 +15,7 @@
 =end
 
 module URI
-  VERSION_CODE = '000910'.freeze
+  VERSION_CODE = '000911'.freeze
   VERSION = VERSION_CODE.scan(/../).collect{|n| n.to_i}.join('.').freeze
 end
 
diff --git a/lib/uri/ftp.rb b/lib/uri/ftp.rb
index fc22a99753..8183fbcd51 100644
--- a/lib/uri/ftp.rb
+++ b/lib/uri/ftp.rb
@@ -132,7 +132,7 @@ module URI
 
 =begin
 =end
-    def to_str
+    def to_s
       save_path = nil
       if @typecode
 	save_path = @path
diff --git a/lib/uri/mailto.rb b/lib/uri/mailto.rb
index 0b0d0a5878..f01673fd63 100644
--- a/lib/uri/mailto.rb
+++ b/lib/uri/mailto.rb
@@ -217,7 +217,7 @@ module URI
       v
     end
 
-    def to_str
+    def to_s
       @scheme + ':' + 
 	if @to 
 	  @to