diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a6dbef18c1d..63889951a28 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2000-08-15  Andrew Haley  <aph@cygnus.com>
+
+	* include/jvm.h (_Jv_HashCode): New hash code.
+
 2000-08-15  Tom Tromey  <tromey@cygnus.com>
 
 	* java/io/ByteArrayOutputStream.java: Merged with Classpath.
diff --git a/libjava/include/jvm.h b/libjava/include/jvm.h
index ad187c090b0..5d5e0b9b24b 100644
--- a/libjava/include/jvm.h
+++ b/libjava/include/jvm.h
@@ -163,7 +163,9 @@ void _Jv_RunMain (const char* name, int argc, const char **argv);
 inline jint
 _Jv_HashCode (jobject obj)
 {
-  return (jint) obj;
+  // This was chosen to yield relatively well distributed results on
+  // both 32- and 64-bit architectures.
+  return (jint) ((unsigned long long) obj % 0x7fffffff);
 }
 
 // Return a raw pointer to the elements of an array given the array