diff --git a/ChangeLog b/ChangeLog
index 2e1a1169b..74fdba9fc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-25  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSScanner.m: initialisation fix pointed out by David Ayer
+	* Source/NSBundle.m: fix for getting class from gnustep bundle
+
 2006-08-16  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* NSCharacterSets/letterCharSet.dat:
diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index 801fdccb3..35395091a 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -1265,8 +1265,10 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
   if (self == _mainBundle || self == _gnustep_bundle)
     {
       theClass = NSClassFromString(className);
-      if (theClass && [[self class] bundleForClass:theClass] != _mainBundle)
-	theClass = Nil;
+      if (theClass && [[self class] bundleForClass: theClass] != self)
+        {
+	  theClass = Nil;
+	}
     }
   else
     {