diff --git a/ChangeLog b/ChangeLog
index 6e1f1a9e9e..fb3da46262 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 12 23:32:11 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/mkmf.rb: keep curdir unexpanded.
+
 Mon Jul 11 23:50:17 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c, intern.h (rb_proc_call, rb_obj_method, rb_method_call):
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index f1ce3f41e4..157f20ce83 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1242,8 +1242,11 @@ end
 Config::CONFIG["srcdir"] = CONFIG["srcdir"] =
   $srcdir = arg_config("--srcdir", File.dirname($0))
 $configure_args["--topsrcdir"] ||= $srcdir
-$curdir = arg_config("--curdir", Dir.pwd)
-Config.expand(curdir = $curdir.dup)
+if $curdir = arg_config("--curdir")
+  Config.expand(curdir = $curdir.dup)
+else
+  curdir = $curdir = "."
+end
 unless File.expand_path(Config::CONFIG["topdir"]) == File.expand_path(curdir)
   CONFIG["topdir"] = $curdir
   Config::CONFIG["topdir"] = curdir