diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 87c2fc5b2e86..f609d268bb21 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-20  Keith Seitz  <keiths@redhat.com>
+
+	* classpath/lib/gnu/classpath/jdwp/value/StringValue.class:
+	Regenerate.
+
 2007-07-20  Keith Seitz  <keiths@redhat.com>
 
 	* gnu/classpath/jdwp/VMVirtualMachine.java (executeMethod):
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 669437a783ac..9f136e094d26 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-20  Keith Seitz  <keiths@redhat.com>
+
+	* gnu/classpath/jdwp/value/StringValue.java
+	(StringValue): Tag of StringValue is STRING not OBJECT.
+	(write): String values are written to the wire as tag byte
+	and object ID, not JdwpString.
+
 2007-07-20  Keith Seitz  <keiths@redhat.com>
 
 	* gnu/classpath/jdwp/processor/ClassTypeCommandSet.java
diff --git a/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java b/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java
index 2371547efeda..1a7d0328d561 100644
--- a/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java
+++ b/libjava/classpath/gnu/classpath/jdwp/value/StringValue.java
@@ -38,7 +38,8 @@ exception statement from your version. */
 package gnu.classpath.jdwp.value;
 
 import gnu.classpath.jdwp.JdwpConstants;
-import gnu.classpath.jdwp.util.JdwpString;
+import gnu.classpath.jdwp.VMIdManager;
+import gnu.classpath.jdwp.id.ObjectId;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -61,7 +62,7 @@ public final class StringValue
    */
   public StringValue(String value)
   {
-    super(JdwpConstants.Tag.OBJECT);
+    super(JdwpConstants.Tag.STRING);
     _value = value;
   }
   
@@ -95,6 +96,8 @@ public final class StringValue
   protected void write(DataOutputStream os)
     throws IOException
   {
-    JdwpString.writeString(os, _value);
+    ObjectId oid = VMIdManager.getDefault().getObjectId (_value);
+    oid.write (os);
+
   }
 }
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class b/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class
index 32526db8bdb1..3298eb59b270 100644
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class and b/libjava/classpath/lib/gnu/classpath/jdwp/value/StringValue.class differ