diff --git a/ChangeLog b/ChangeLog
index 9d1122f099..2511c81f5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jul  8 00:05:23 2004  akira yamada  <akira@ruby-lang.org>
+
+	* lib/tempfile.rb (Tempfile::initialize): got out code of
+	  generating tmpname.  [ruby-dev:23832][ruby-dev:23837]
+
 Wed Jul  7 02:31:41 2004  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/{rss,parser,0.9,1.0,2.0}.rb: supported RSS 0.9x/2.0
diff --git a/lib/tempfile.rb b/lib/tempfile.rb
index 9333505178..6eb11beb0b 100644
--- a/lib/tempfile.rb
+++ b/lib/tempfile.rb
@@ -33,7 +33,7 @@ class Tempfile < DelegateClass(File)
       Thread.critical = true
 
       begin
-	tmpname = sprintf('%s/%s%d.%d', tmpdir, basename, $$, n)
+	tmpname = File.join(tmpdir, make_tmpname(basename, n))
 	lock = tmpname + '.lock'
 	n += 1
       end while @@cleanlist.include?(tmpname) or
@@ -66,6 +66,11 @@ class Tempfile < DelegateClass(File)
     Dir.rmdir(lock)
   end
 
+  def make_tmpname(basename, n)
+    sprintf('%s%d.%d', basename, $$, n)
+  end
+  private :make_tmpname
+
   # Opens or reopens the file with mode "r+".
   def open
     @tmpfile.close if @tmpfile