diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 09b7e07183e..3d0b9eca45a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-04  Kyle Galloway  <kgallowa@redhat.com>
+
+	* classpath/gnu/classpath/jdwp/util/VariableTable.java: Change longs
+	to ints for argCnt and slots.
+	(write): Replace writeLong with writeInt for the above. 
+
 2007-04-03  Andrew Haley  <aph@redhat.com>
 
 	* testsuite/libjava.lang/ProxyTest.java: New test.
diff --git a/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java b/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java
index 22d8c7dd621..f30c2158100 100644
--- a/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java
+++ b/libjava/classpath/gnu/classpath/jdwp/util/VariableTable.java
@@ -50,9 +50,9 @@ import java.io.IOException;
 public class VariableTable
 {
 
-  private final long argCnt;
+  private final int argCnt;
 
-  private final long slots;
+  private final int slots;
 
   private final long[] lineCI;
 
@@ -95,8 +95,8 @@ public class VariableTable
    */
   public void write(DataOutputStream os) throws IOException
   {
-    os.writeLong(argCnt);
-    os.writeLong(slots);
+    os.writeInt(argCnt);
+    os.writeInt(slots);
     for (int i = 0; i < slots; i++)
       {
         os.writeLong(lineCI[i]);
diff --git a/libjava/classpath/lib/gnu/classpath/jdwp/util/VariableTable.class b/libjava/classpath/lib/gnu/classpath/jdwp/util/VariableTable.class
index 7c653c3d6d3..0ba47cd0dc5 100644
Binary files a/libjava/classpath/lib/gnu/classpath/jdwp/util/VariableTable.class and b/libjava/classpath/lib/gnu/classpath/jdwp/util/VariableTable.class differ
diff --git a/libjava/gnu/classpath/jdwp/util/VariableTable.h b/libjava/gnu/classpath/jdwp/util/VariableTable.h
index 05b0477fed7..893348e4fad 100644
--- a/libjava/gnu/classpath/jdwp/util/VariableTable.h
+++ b/libjava/gnu/classpath/jdwp/util/VariableTable.h
@@ -33,8 +33,8 @@ public:
   VariableTable(jint, jint, JArray< jlong > *, JArray< ::java::lang::String * > *, JArray< ::java::lang::String * > *, JArray< jint > *, JArray< jint > *);
   virtual void write(::java::io::DataOutputStream *);
 private:
-  jlong __attribute__((aligned(__alignof__( ::java::lang::Object)))) argCnt;
-  jlong slots;
+  jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) argCnt;
+  jint slots;
   JArray< jlong > * lineCI;
   JArray< jint > * slot;
   JArray< jint > * lengths;