diff --git a/ChangeLog b/ChangeLog
index 887d4b95a7..1d2bf9669b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Dec  7 01:15:07 2012  Naohisa Goto  <ngotogenome@gmail.com>
+
+	* ext/fiddle/lib/fiddle/function.rb (Fiddle::Function#name): new
+	  attribute needed to switch Win32::Registry from DL to Fiddle.
+
+	* ext/fiddle/lib/fiddle/import.rb (import_function, bind_function):
+	  set function name to the returned Fiddle::Function object.
+
 Fri Dec  7 00:11:44 2012  Shugo Maeda  <shugo@ruby-lang.org>
 
 	* test/ruby/test_refinement.rb: fix some tests to use neither
diff --git a/ext/fiddle/lib/fiddle/function.rb b/ext/fiddle/lib/fiddle/function.rb
index 07a072e021..ab7496e944 100644
--- a/ext/fiddle/lib/fiddle/function.rb
+++ b/ext/fiddle/lib/fiddle/function.rb
@@ -6,6 +6,9 @@ module Fiddle
     # The address of this function
     attr_reader :ptr
 
+    # The name of this function
+    attr_reader :name
+
     # The integer memory location of this function
     def to_i
       ptr.to_i
diff --git a/ext/fiddle/lib/fiddle/import.rb b/ext/fiddle/lib/fiddle/import.rb
index f5a069b48a..faf7cb3d23 100644
--- a/ext/fiddle/lib/fiddle/import.rb
+++ b/ext/fiddle/lib/fiddle/import.rb
@@ -290,7 +290,9 @@ module Fiddle
       if( !addr )
         raise(DLError, "cannot find the function: #{name}()")
       end
-      Function.new(addr, argtype, ctype, CALL_TYPE_TO_ABI[call_type])
+      f = Function.new(addr, argtype, ctype, CALL_TYPE_TO_ABI[call_type])
+      f.instance_eval { @name = name }
+      f
     end
 
     # Returns a new closure wrapper for the +name+ function.
@@ -307,7 +309,9 @@ module Fiddle
         define_method(:call, block)
       }.new(ctype, argtype, abi)
 
-      Function.new(closure, argtype, ctype, abi)
+      f = Function.new(closure, argtype, ctype, abi)
+      f.instance_eval { @name = name }
+      f
     end
   end
 end