diff --git a/ChangeLog b/ChangeLog
index a4d0d5bca2..47767f5da2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Oct 27 15:44:48 2009  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* lib/net/ftp.rb (getbinaryfile, list): call to_s to convert
+	  a Pathname instance into a string.  [ruby-core:26237]
+
 Tue Oct 27 12:30:16 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* gc.h (SET_MACHINE_STACK_END): use __i386__ instead of __i386,
diff --git a/lib/net/ftp.rb b/lib/net/ftp.rb
index 8ae3e1610f..52bd37595d 100644
--- a/lib/net/ftp.rb
+++ b/lib/net/ftp.rb
@@ -523,7 +523,7 @@ module Net
       end
       begin
 	f.binmode if localfile
-	retrbinary("RETR " + remotefile, blocksize, rest_offset) do |data|
+	retrbinary("RETR " + remotefile.to_s, blocksize, rest_offset) do |data|
 	  f.write(data) if localfile
 	  yield(data) if block_given?
           result.concat(data) if result
@@ -656,7 +656,7 @@ module Net
     def list(*args, &block) # :yield: line
       cmd = "LIST"
       args.each do |arg|
-	cmd = cmd + " " + arg
+	cmd = cmd + " " + arg.to_s
       end
       if block
 	retrlines(cmd, &block)