diff --git a/ext/tk/ChangeLog.tkextlib b/ext/tk/ChangeLog.tkextlib
index dc04585985..325fd99ac1 100644
--- a/ext/tk/ChangeLog.tkextlib
+++ b/ext/tk/ChangeLog.tkextlib
@@ -1,3 +1,8 @@
+2005-06-08  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
+
+	* lib/tkextlib/ICONS/icons.rb: fail to create instances of
+	  Tk::ICONS [ruby-dev:26305].
+
 2005-06-07  ocean  <ocean@ruby-lang.org>
 
 	* sample/tkextlib/tile/themes/kroc.{rb,tcl}: also support tile 0.4.
diff --git a/ext/tk/lib/tkextlib/ICONS/icons.rb b/ext/tk/lib/tkextlib/ICONS/icons.rb
index 68e7656945..8a37e35ebf 100644
--- a/ext/tk/lib/tkextlib/ICONS/icons.rb
+++ b/ext/tk/lib/tkextlib/ICONS/icons.rb
@@ -76,7 +76,11 @@ module Tk
     ##########################################
 
     def self.new(name, keys=nil)
-      Tk_IMGTBL["::icon::#{name}"] || super
+      unless obj = Tk_IMGTBL["::icon::#{name}"]
+        obj = allocate()
+        obj.instance_eval{initialize(name, keys)}
+      end
+      obj
     end
 
     def initialize(name, keys=nil)