diff --git a/ChangeLog b/ChangeLog
index 68ad46b59c..b5395f001b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Nov 10 10:50:43 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* lib/delegate.rb (Delegator.delegating_block): should not refer
+	  DelegateClass specific @delegate_dc_obj.  a patch from Erik
+	  Hollensbe in [ruby-core:19671].
+
 Mon Nov 10 09:54:21 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/win32.c (ifs_open_socket): should retry without proto_buffer
diff --git a/lib/delegate.rb b/lib/delegate.rb
index 353c68ee97..025e901a89 100644
--- a/lib/delegate.rb
+++ b/lib/delegate.rb
@@ -234,7 +234,7 @@ end
 def Delegator.delegating_block(mid)
   lambda do |*args, &block|
     begin
-      @delegate_dc_obj.__send__(mid, *args, &block)
+      __getobj__.__send__(mid, *args, &block)
     rescue
       re = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}:/o
       $!.backtrace.delete_if {|t| re =~ t}