diff --git a/ChangeLog b/ChangeLog
index c92924583..0647079bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-04-21  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSBundle.m: ([mainBundle]) Fix error determining whether
+	the bundle is an app or not ... was breaking lookup of tool resources.
+
 2010-04-19  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/cifframe.m (cifframe_type): Fix the cached information
diff --git a/Source/NSBundle.m b/Source/NSBundle.m
index 28f8c7830..7434ae5d1 100644
--- a/Source/NSBundle.m
+++ b/Source/NSBundle.m
@@ -1054,17 +1054,12 @@ _bundle_load_callback(Class theClass, struct objc_category *theCategory)
 	    && [s hasSuffix: @".gswa"] == NO	// GNUstep Web
 	    && [s hasSuffix: @".woa"] == NO	// GNUstep Web
 	    )
-	    {
-	      /* Well known file extension ... app wrapper format.
-	       */
-	      isApplication = YES;
-	    }
-	  else
 	    {
 	      NSFileManager	*mgr = manager();
 	      BOOL		f;
 
-	      /* Might be an app wrapper with another extension...
+	      /* Not one of the common extensions, but
+	       * might be an app wrapper with another extension...
 	       * Look for Info-gnustep.plist or Info.plist in a
 	       * Resources subdirectory.
 	       */