diff --git a/ChangeLog b/ChangeLog
index 8feb570ac4..f6658c0d02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun May 15 22:28:10 2005  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb (DRbObject#method_missing): use raise(exception).
+	  [ruby-dev:26164]
+
 Sun May 15 18:56:35 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in, ruby.h: define rb_[pgu]id_t macros instead of typedefs
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 13cc360d34..1c8a823eda 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -1090,7 +1090,8 @@ module DRb
         raise result
       else
         bt = self.class.prepare_backtrace(@uri, result)
-        raise result, result.message, bt + caller
+	result.set_backtrace(bt + caller)
+        raise result
       end
     end