diff --git a/ChangeLog b/ChangeLog
index 368fac02f..6ea653a16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-30  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSBundleAdditions.m (-pathForNibResource:) ignore
+	extension "nib", so "gorm" or "gmodel" get used instead.
+
 2003-12-30  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/AppKit/NSAffineTransform.h: Corrected element names tX
diff --git a/Source/NSBundleAdditions.m b/Source/NSBundleAdditions.m
index 1fc3205aa..15401e977 100644
--- a/Source/NSBundleAdditions.m
+++ b/Source/NSBundleAdditions.m
@@ -418,6 +418,10 @@ Class gmodel_class(void)
 
   ext = [fileName pathExtension];
   fileName = [fileName stringByDeletingPathExtension];
+  if ([ext isEqualToString: @"nib"] == YES)
+    {
+      ext = @"";
+    }
 
   /*
    * Build an array of resource paths that differs from the normal order -
@@ -457,14 +461,10 @@ Class gmodel_class(void)
 	  path = [rootPath stringByAppendingPathExtension: @"gorm"];
 	  if ([mgr isReadableFileAtPath: path] == NO)
 	    {
-	      path = [rootPath stringByAppendingPathExtension: @"nib"];
+	      path = [rootPath stringByAppendingPathExtension: @"gmodel"];
 	      if ([mgr isReadableFileAtPath: path] == NO)
 		{
-		  path = [rootPath stringByAppendingPathExtension: @"gmodel"];
-		  if ([mgr isReadableFileAtPath: path] == NO)
-		    {
-		      continue;
-		    }
+		  continue;
 		}
 	    }
 	  return path;