diff --git a/ChangeLog b/ChangeLog
index ba4e12cb4..3c2d6b23f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Jul 28 15:53:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
+
+	* Source/NSObject.h: ([+isKindOfClass:]) Fixed to return NO except
+	when both the argument and the receiver are NSObject - as specified
+	in the MacOS-X documentation.  Thanks to Helge for pointing this out.
+
 Mon Jul 26 21:22:00 1999  Richard Frith-Macdonald <richard@brainstorm.co.uk>
 
 	Fix cStrings to use unsigned char throughout - to avoid problems
diff --git a/Source/NSObject.m b/Source/NSObject.m
index 02c691548..5c3230ce8 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -782,15 +782,8 @@ static BOOL double_release_check_enabled = NO;
 
 + (BOOL) isKindOfClass: (Class)aClass
 {
-  Class class;
-
-  for (class = self; 
-       class != Nil;
-       class = class_get_super_class (class))
-    {
-      if (class == aClass)
-	return YES;
-    }
+  if (aClass == [NSObject class])
+    return YES;
   return NO;
 }