diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 427d09ea2c4..079c8e2a208 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,15 @@
+2007-05-07  Keith Seitz  <keiths@redhat.com>
+
+	* classpath/lib/gnu/classpath/jdwp/Jdwp.class: Regenerate.
+	* classpath/lib/gnu/classpath/jdwp/Jdwp$1.class: Regenerate.
+	* classpath/lib/gnu/classpath/jdwp/event/Event.class:
+	Regenerate.
+	* classpath/lib/gnu/classpath/jdwp/transport/JdwpConnection.class:
+	Regenerate.
+	* gnu/classpath/jdwp/Jdwp.h: Regenerate.
+	* gnu/classpath/jdwp/event/Event.h: Regenerate.
+	* gnu/classpath/jdwp/transport/JdwpConnection.h: Regenerate.
+
 2007-05-04  Kyle Galloway  <kgallowa@redhat.com>
 
 	* gnu/classpath/jdwp/natVMVirtualMachine.cc (getClassMethod): Change
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp$1.class b/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp$1.class
index ce9e9a32bf2..8cca3300eba 100644
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp$1.class and b/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp$1.class differ
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp.class b/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp.class
index 616beaa1fab..b0f3dc257c3 100644
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp.class and b/libjava/classpath/lib/gnu/classpath/jdwp/Jdwp.class differ
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/event/Event.class b/libjava/classpath/lib/gnu/classpath/jdwp/event/Event.class
index d7230bd5ab3..f8a27d334c1 100644
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/event/Event.class and b/libjava/classpath/lib/gnu/classpath/jdwp/event/Event.class differ
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpConnection.class b/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpConnection.class
index 2f1c37d2fd5..335411555c1 100644
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpConnection.class and b/libjava/classpath/lib/gnu/classpath/jdwp/transport/JdwpConnection.class differ
diff --git a/libjava/gnu/classpath/jdwp/Jdwp.h b/libjava/gnu/classpath/jdwp/Jdwp.h
index 0d851371f88..ba10ead722c 100644
--- a/libjava/gnu/classpath/jdwp/Jdwp.h
+++ b/libjava/gnu/classpath/jdwp/Jdwp.h
@@ -7,6 +7,8 @@
 #pragma interface
 
 #include <java/lang/Thread.h>
+#include <gcj/array.h>
+
 extern "Java"
 {
   namespace gnu
@@ -48,7 +50,9 @@ private:
 public:
   virtual void shutdown();
   static void notify(::gnu::classpath::jdwp::event::Event *);
+  static void notify(JArray< ::gnu::classpath::jdwp::event::Event * > *);
   static void sendEvent(::gnu::classpath::jdwp::event::EventRequest *, ::gnu::classpath::jdwp::event::Event *);
+  static void sendEvents(JArray< ::gnu::classpath::jdwp::event::EventRequest * > *, JArray< ::gnu::classpath::jdwp::event::Event * > *, jbyte);
 private:
   void _enforceSuspendPolicy(jbyte);
 public:
diff --git a/libjava/gnu/classpath/jdwp/event/Event.h b/libjava/gnu/classpath/jdwp/event/Event.h
index 19dc07847c3..132d6b50dfc 100644
--- a/libjava/gnu/classpath/jdwp/event/Event.h
+++ b/libjava/gnu/classpath/jdwp/event/Event.h
@@ -7,6 +7,8 @@
 #pragma interface
 
 #include <java/lang/Object.h>
+#include <gcj/array.h>
+
 extern "Java"
 {
   namespace gnu
@@ -39,7 +41,10 @@ public: // actually protected
   virtual void _writeData(::java::io::DataOutputStream *) = 0;
 public:
   virtual ::java::lang::Object * getParameter(jint) = 0;
-  virtual ::gnu::classpath::jdwp::transport::JdwpPacket * toPacket(::java::io::DataOutputStream *, ::gnu::classpath::jdwp::event::EventRequest *);
+  static ::gnu::classpath::jdwp::transport::JdwpPacket * toPacket(::java::io::DataOutputStream *, JArray< ::gnu::classpath::jdwp::event::Event * > *, JArray< ::gnu::classpath::jdwp::event::EventRequest * > *, jbyte);
+private:
+  static void _toData(::java::io::DataOutputStream *, ::gnu::classpath::jdwp::event::Event *, ::gnu::classpath::jdwp::event::EventRequest *);
+public:
   static const jint EVENT_CLASS = 1;
   static const jint EVENT_THREAD = 2;
   static const jint EVENT_LOCATION = 3;
diff --git a/libjava/gnu/classpath/jdwp/transport/JdwpConnection.h b/libjava/gnu/classpath/jdwp/transport/JdwpConnection.h
index aa6a0272a6f..a8333af9ca1 100644
--- a/libjava/gnu/classpath/jdwp/transport/JdwpConnection.h
+++ b/libjava/gnu/classpath/jdwp/transport/JdwpConnection.h
@@ -48,7 +48,7 @@ private:
 public:
   virtual ::gnu::classpath::jdwp::transport::JdwpPacket * getPacket();
   virtual void sendPacket(::gnu::classpath::jdwp::transport::JdwpPacket *);
-  virtual void sendEvent(::gnu::classpath::jdwp::event::EventRequest *, ::gnu::classpath::jdwp::event::Event *);
+  virtual void sendEvents(JArray< ::gnu::classpath::jdwp::event::EventRequest * > *, JArray< ::gnu::classpath::jdwp::event::Event * > *, jbyte);
   virtual void shutdown();
 private:
   static JArray< jbyte > * _HANDSHAKE;