diff --git a/ChangeLog b/ChangeLog
index 42a9ac8d6..92f928cbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-10  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSBundleAdditions.m: ([loadNibNamed:owner:]) if the NIB can't
+	be found in the owners bundle, try the main bundle of the application.
+	Fixes loading where the files owner is in a library, framework or
+	bundle, but the Gorm/NIB file is in the application resources.
+	I'm not sure this is the correct order, perhaps we should try the
+	main bundle first and the library/framework only if the rersource
+	is not in the main bundle.
+
 2006-05-06  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Resources/Esperanto.lproj/Localizable.string,
diff --git a/Source/NSBundleAdditions.m b/Source/NSBundleAdditions.m
index ff94e03da..db781fe8c 100644
--- a/Source/NSBundleAdditions.m
+++ b/Source/NSBundleAdditions.m
@@ -344,7 +344,13 @@ Class gmodel_class(void)
     }
   table = [NSDictionary dictionaryWithObject: owner forKey: @"NSOwner"];
   bundle = [self bundleForClass: [owner class]];
-  if (bundle == nil)
+  if (bundle != nil && [bundle loadNibFile: aNibName
+			 externalNameTable: table
+				  withZone: [owner zone]] == YES)
+    {
+      return YES;
+    }
+  else
     {
       bundle = [self mainBundle];
     }