diff --git a/ChangeLog b/ChangeLog
index 4900086527..0568ba6dd8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri May 18 05:19:55 2001  Akinori MUSHA  <knu@iDaemons.org>
+
+	* lib/mkmf.rb (xsystem): make a temporary fix to get $(...) macros
+	  properly expanded on a command execution.
+
+	* ext/extmk.rb.in (xsystem): ditto.
+
 Fri May 18 03:45:55 2001  Brian F. Feldman  <green@FreeBSD.org>
 
 	* lib/mkmf.rb: unbreak "make install".  lib/* must be installed
diff --git a/ext/extmk.rb.in b/ext/extmk.rb.in
index 9e454cc429..fa3921c2c2 100644
--- a/ext/extmk.rb.in
+++ b/ext/extmk.rb.in
@@ -82,6 +82,7 @@ end
 $orgerr = $stderr.dup
 $orgout = $stdout.dup
 def xsystem command
+  Config.expand(command)
   if $DEBUG
     puts command
     return system(command)
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index cd1620ee9a..e9c78dace7 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -62,6 +62,7 @@ end
 $orgerr = $stderr.dup
 $orgout = $stdout.dup
 def xsystem command
+  Config.expand(command)
   if $DEBUG
     print command, "\n"
     return system(command)