diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index d4403ef6ad4..8d9944d4c85 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2003-04-14  Tom Tromey  <tromey@redhat.com>
+
+	* resolve.cc (_Jv_PrepareClass): Round up class size to multiple
+	of alignment.
+
 2003-04-10  Tom Tromey  <tromey@redhat.com>
 
 	* verify.cc (pop64): Removed.
diff --git a/libjava/resolve.cc b/libjava/resolve.cc
index ea506452d58..fbdc284945f 100644
--- a/libjava/resolve.cc
+++ b/libjava/resolve.cc
@@ -513,7 +513,10 @@ _Jv_PrepareClass(jclass klass)
 	}
     }
 
-  // set the instance size for the class
+  // Set the instance size for the class.  Note that first we round it
+  // to the alignment required for Object; this keeps us in sync with
+  // our current ABI.
+  instance_size = ROUND (instance_size, __alignof__ (java::lang::Object));
   clz->size_in_bytes = instance_size;
 
   // allocate static memory