diff --git a/ChangeLog b/ChangeLog
index e43ed2a4e6..08a47a72d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 27 17:15:03 2005  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* ext/tk/extconf.rb: support new tk scheme on bccwin32.
+	  fixed: [ruby-dev:25546]
+
 Thu Jan 27 00:12:19 2005  Minero Aoki  <aamine@loveruby.net>
 
 	* test/fileutils/test_fileutils.rb (setup): support BSD style
diff --git a/ext/tk/extconf.rb b/ext/tk/extconf.rb
index 919ce92c0c..996aa6caeb 100644
--- a/ext/tk/extconf.rb
+++ b/ext/tk/extconf.rb
@@ -316,7 +316,7 @@ if mac_need_framework ||
     mk_tkutil << "@-$(RM) $@\n\t"
     mk_tkutil << "@-$(RM) $(TARGET2).lib\n\t" if $mswin
 
-    LINK_SO2 = LINK_SO.gsub(/\$\(DLLIB\)/, '$(DLLIB2)').gsub(/\$\(OBJS\)/, '$(OBJS2)').gsub(/\$\(DLDFLAGS\)/, '$(DLDFLAGS2)')
+    LINK_SO2 = LINK_SO.gsub(/\$\(DLLIB\)/, '$(DLLIB2)').gsub(/\$\(OBJS\)/, '$(OBJS2)').gsub(/\$\(DLDFLAGS\)/, '$(DLDFLAGS2)').gsub(/\$\(DEFFILE\)/, '$(DEFFILE2)')
     mk_tkutil << LINK_SO2
 
     mk_tkutil << "\n\n"
@@ -331,7 +331,7 @@ if mac_need_framework ||
 
     if EXPORT_PREFIX
       mk_tkutil << "$(DEFFILE2):\n"
-      mk_tkutil << %Q!\t$(RUBY) -e "puts 'EXPORTS', 'Init_$(TARGET2)'" > $@\n!
+      mk_tkutil << %Q!\t$(RUBY) -e "puts 'EXPORTS', '#{EXPORT_PREFIX}Init_$(TARGET2)'" > $@\n!
       mk_tkutil << "\n\n"
     end
     mk_tkutil << "\n"