diff --git a/ChangeLog b/ChangeLog
index 1750cc2d07..a37e44687a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Nov 29 22:45:30 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/observer.rb (notify_observers): follow change of observer.rb.
+	  fixed: [ruby-core:6796]
+
 Mon Nov 28 20:24:22 2005  Tanaka Akira  <akr@m17n.org>
 
 	* lib/pp.rb (PP::PPMethods#object_address_group): adjust address format.
diff --git a/lib/drb/observer.rb b/lib/drb/observer.rb
index e7f1668c52..f2c3455e57 100644
--- a/lib/drb/observer.rb
+++ b/lib/drb/observer.rb
@@ -6,16 +6,17 @@ module DRb
 
     def notify_observers(*arg)
       if defined? @observer_state and @observer_state
-	if defined? @observer_peers
-	  for i in @observer_peers.dup
-	    begin
-	      i.update(*arg)
-	    rescue
-	      delete_observer(i)
-	    end
-	  end
-	end
-	@observer_state = false
+        if defined? @observer_peers
+          @observer_peers.delete_if do |k, v|
+            begin
+              k.send(v, *arg)
+              false
+            rescue
+              true
+            end
+          end
+        end
+        @observer_state = false
       end
     end
   end