diff --git a/ChangeLog b/ChangeLog
index 0c35b13cb7..5734fbce21 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Feb 25 13:32:13 2002  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
+
+	* lib/shell.rb (Shell::expand_path): relative to @cwd.
+
 Sun Feb 24 17:20:22 2002  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/*/*.h: Merge from rough.
diff --git a/lib/shell.rb b/lib/shell.rb
index bed9c052e8..acc4adec0b 100644
--- a/lib/shell.rb
+++ b/lib/shell.rb
@@ -116,7 +116,7 @@ class Shell
   attr_reader :process_controller
 
   def expand_path(path)
-    File.expand_path(path)
+    File.expand_path(path, @cwd)
   end
 
   # Most Shell commands are defined via CommandProcessor