diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0679c021984..44d9ce4f1f9 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-30  Tom Tromey  <tromey@redhat.com>
+
+	* java/rmi/server/UID.java (UID): Read `nextCount', not count.
+
 2004-08-30  Andreas Tobler  <a.tobler@schweiz.ch>
 
 	* gnu/java/security/der/DEREncodingException.java: Remove whitespaces.
diff --git a/libjava/java/rmi/server/UID.java b/libjava/java/rmi/server/UID.java
index a88cb8b08e0..4c8a04110a8 100644
--- a/libjava/java/rmi/server/UID.java
+++ b/libjava/java/rmi/server/UID.java
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+  Copyright (c) 1996, 1997, 1998, 1999, 2004 Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -65,7 +65,7 @@ private short count;
  */
 public UID() {
 	synchronized (lock) {
-		if (count == Short.MAX_VALUE) {
+		if (nextCount == Short.MAX_VALUE) {
 			long newtime;
 			for (;;) {
 				newtime = System.currentTimeMillis();