diff --git a/ChangeLog b/ChangeLog
index 20af88f09..79204a70e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-03 17:23-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/NSDocumentController.m: Fixed fileExtensionFromType:,
+	bug #24894
+
 2008-12-03 01:38-EST Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/GSInfoPanel.m: -[GSInfoPanel initWithDictionary:]
diff --git a/Source/NSDocumentController.m b/Source/NSDocumentController.m
index 678844586..f13a52247 100644
--- a/Source/NSDocumentController.m
+++ b/Source/NSDocumentController.m
@@ -1001,10 +1001,14 @@ static NSDictionary *TypeInfoForHumanReadableName (NSArray *types, NSString *typ
   NSDictionary *typeInfo = TYPE_INFO(type);
   NSArray *unixExtensions = [typeInfo objectForKey: NSUnixExtensionsKey];
   NSArray *dosExtensions  = [typeInfo objectForKey: NSDOSExtensionsKey];
-  
+  NSArray *cfFileExtensions = [typeInfo objectForKey: CFBundleTypeExtensions];
+
+  if (!dosExtensions && !unixExtensions) return cfFileExtensions;
   if (!dosExtensions)  return unixExtensions;
   if (!unixExtensions) return dosExtensions;
-  return [unixExtensions arrayByAddingObjectsFromArray: dosExtensions];
+
+  return [[unixExtensions arrayByAddingObjectsFromArray: dosExtensions] 
+	   arrayByAddingObjectsFromArray: cfFileExtensions];
 }
 
 - (Class) documentClassForType: (NSString *)type