diff --git a/ChangeLog b/ChangeLog
index 8636a10d7b..c0ba377a0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jun 29 06:59:07 2003  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* lib/drb/drb.rb, lib/drb/invokemethod.rb: import drb-2.0.4
+	  (use LocalJumpError#reason)
+
 Sat Jun 28 12:28:54 2003  Nobuyoshi Nakada  <nobu.nokada@softhome.net>
 
 	* configure.in (rb_cv_stack_grow_dir): check stack growing direction.
diff --git a/lib/drb/drb.rb b/lib/drb/drb.rb
index 85cd3bc898..e6ea35cfc1 100644
--- a/lib/drb/drb.rb
+++ b/lib/drb/drb.rb
@@ -689,17 +689,6 @@ module DRb
 	end
       end
 
-      def rescue_local_jump(err)
-	case err.message
-	when /^retry/	# retry from proc-closure
-	  return :retry
-	when /^break/	# break from proc-closure
-	  return rescue_break(err)
-	else
-	  return :unknown
-	end
-      end
-
     end
 
     if RUBY_VERSION >= '1.8'
@@ -708,43 +697,7 @@ module DRb
         include InvokeMethod18Mixin
       end
     else
-      module InvokeMethod16Mixin
-	def block_yield(x)
-          if x.class == Array
-	    block_value = @block.__drb_yield(*x)
-          else
-	    block_value = @block.__drb_yield(x)
-          end
-	end
-
-	def rescue_break(err)
-	  return :break
-	end
-
-	def perform_with_block
-	  @obj.__send__(@msg_id, *@argv) do |x|
-	    jump_error = nil
-	    begin
-	      block_value = block_yield(x)
-	    rescue LocalJumpError
-	      jump_error = $!
-	    end
-	    if jump_error
-	      reason ,= rescue_local_jump(jump_error)
-	      case reason
-	      when :retry
-		retry
-	      when :break
-		break
-	      else
-		raise jump_error
-	      end
-	    end
-	    block_value
-	  end
-	end
-      end
-
+      require 'drb/invokemethod16'
       class InvokeMethod
         include InvokeMethod16Mixin
       end
diff --git a/lib/drb/invokemethod.rb b/lib/drb/invokemethod.rb
index f8ce0ad09b..6d6c9562c3 100644
--- a/lib/drb/invokemethod.rb
+++ b/lib/drb/invokemethod.rb
@@ -1,4 +1,3 @@
-
 # for ruby-1.8.0
 
 module DRb
@@ -8,10 +7,6 @@ module DRb
         block_value = @block.call(*x)
       end
       
-      def rescue_break(err)
-        return :break, err.exit_value
-      end
-      
       def perform_with_block
         @obj.__send__(@msg_id, *@argv) do |*x|
           jump_error = nil
@@ -21,12 +16,11 @@ module DRb
             jump_error = $!
           end
           if jump_error
-            reason, jump_value = rescue_local_jump(jump_error)
-            case reason
+            case jump_error.reason
             when :retry
               retry
             when :break
-              break(jump_value)
+              break(jump_error.exit_value)
             else
               raise jump_error
             end