diff --git a/ChangeLog b/ChangeLog
index 91d706a819..e65daf9587 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Fri Aug  5 00:18:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+Fri Aug  5 00:19:33 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* enumerator.c (Init_Enumerator): provided features should have
 	  extensions.
@@ -14,6 +14,8 @@ Fri Aug  5 00:18:19 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 	* parse.y (f_rest_arg): use anonymous variable for rest arguments.
 	  fixed: [ruby-dev:26647]
 
+	* extmk.rb (extmake): needs to be wrapped in an Array.
+
 Thu Aug  4 20:03:18 2005  Tadashi Saito  <shiba@mail2.accsnet.ne.jp>
 
 	* numeric.c (Init_Numeric): do not share implementation among
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 73cd6a1d5f..fc1a2f37ce 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -158,7 +158,7 @@ def extmake(target)
     end
     args = sysquote($mflags)
     unless $destdir.to_s.empty? or $mflags.include?("DESTDIR")
-      args += sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))
+      args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))]
     end
     if $static
       args += ["static"] unless $clean
@@ -429,7 +429,8 @@ SRC
   $extpath.delete("$(topdir)")
   $extflags = libpathflag($extpath) << " " << $extflags.strip
   conf = [
-    ['SETUP', $setup], [$enable_shared && !$force_static ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
+    ['SETUP', $setup],
+    [enable_config("shared", $enable_shared) ? 'DLDOBJS' : 'EXTOBJS', $extobjs],
     ['EXTLIBS', $extlibs.join(' ')], ['EXTLDFLAGS', $extflags]
   ].map {|n, v|
     "#{n}=#{v}" if v and !(v = v.strip).empty?