diff --git a/ChangeLog b/ChangeLog
index 1c67d498f..4a3b63f63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-01-21  Quentin Mathe  <qmathe@club-internet.fr>
+
+	* Source/GSToolbarView.m:
+	* Headers/Additions/GNUstepGUI/GSToolbarView.h:
+	Renamed the NSColor(Extensions) category with the more descriptive name 
+	NSColor(GSToolbarViewAdditions). This modification permits GNUMail 
+	compilation with recent Darwin linker versions which prevented it 
+	because GNUMail has a NSColor category identically named "Extensions".
+
 2005-01-20  Fred Kiefer <FredKiefer@gmx.de>
 
         * Source/NSTableView.m (-rowAtPoint:): If the heigh of the table
diff --git a/Headers/Additions/GNUstepGUI/GSToolbarView.h b/Headers/Additions/GNUstepGUI/GSToolbarView.h
index ff3752a4e..17100f8b9 100644
--- a/Headers/Additions/GNUstepGUI/GSToolbarView.h
+++ b/Headers/Additions/GNUstepGUI/GSToolbarView.h
@@ -79,7 +79,7 @@ typedef enum {
 @end
 
 // Toolbar related NSColor methods
-@interface NSColor (Extensions)
+@interface NSColor (GSToolbarViewAdditions)
 + (NSColor *) toolbarBackgroundColor;
 + (NSColor *) toolbarBorderColor;
 @end
diff --git a/Source/GSToolbarView.m b/Source/GSToolbarView.m
index d437c238d..254f7a907 100644
--- a/Source/GSToolbarView.m
+++ b/Source/GSToolbarView.m
@@ -66,9 +66,6 @@ static NSColor *BorderColor;
 
 
 // Toolbar color extensions
-@interface NSColor (GNUstepPrivate)
-+ (NSColor *) colorFromString: (NSString *)string;
-@end
 
 static void initSystemExtensionsColors(void)
 {
@@ -128,7 +125,7 @@ static void initSystemExtensionsColors(void)
     }
 }
 
-@implementation NSColor (Extensions)
+@implementation NSColor (GSToolbarViewAdditions)
 + (NSColor *) toolbarBackgroundColor
 {
   return [SystemExtensionsColors colorWithKey: @"toolbarBackgroundColor"];