diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 835d744dc26..8580a9f5b10 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2004-09-24  Casey Marshall <csm@gnu.org>
+
+	* java/util/PropertyPermissionCollection.java
+	(implies): avoid infinite loop.
+
 2004-09-24  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* javax/security/auth/PrivateCredentialPermission.java
diff --git a/libjava/java/util/PropertyPermissionCollection.java b/libjava/java/util/PropertyPermissionCollection.java
index 76110349583..5c799238f3f 100644
--- a/libjava/java/util/PropertyPermissionCollection.java
+++ b/libjava/java/util/PropertyPermissionCollection.java
@@ -147,7 +147,7 @@ class PropertyPermissionCollection extends PermissionCollection
               return true;
           }
 
-        prefixLength = name.lastIndexOf('.', prefixLength);
+        prefixLength = name.lastIndexOf('.', prefixLength - 1);
         if (prefixLength < 0)
           return false;
         name = name.substring(0, prefixLength + 1) + '*';