diff --git a/ChangeLog b/ChangeLog
index 736d1c7dcb..e3b9a853b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 22 10:52:19 2003  NAKAMURA Usaku <usa@ruby-lang.org>
+
+	* lib/tmpdir.rb: remove charcters after "\000" and regularize path.
+
 Tue Jul 22 02:22:45 2003  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* numeric.c (num_equal): should not use rb_equal().
diff --git a/lib/tmpdir.rb b/lib/tmpdir.rb
index 5e8dd6bf35..8a21cdc789 100644
--- a/lib/tmpdir.rb
+++ b/lib/tmpdir.rb
@@ -9,9 +9,9 @@ class Dir
     require "Win32API"
     max_pathlen = 260
     t_path = ' '*(max_pathlen+1)
-    t_path[0, Win32API.new('kernel32', 'GetTempPath', 'LP', 'L').call(t_path.size, t_path)]
+    t_path = t_path[0, Win32API.new('kernel32', 'GetTempPath', 'LP', 'L').call(t_path.size, t_path)]
     t_path.untaint
-    TMPDIR = t_path
+    TMPDIR = File.expand_path(t_path)
   rescue LoadError
     if $SAFE > 0
       TMPDIR = '/tmp'