diff --git a/Source/NSAttributedString.m b/Source/NSAttributedString.m
index c7239b8af..e52b65c07 100644
--- a/Source/NSAttributedString.m
+++ b/Source/NSAttributedString.m
@@ -1,8 +1,40 @@
+/* 
+   NSAttributedString.m
+
+   Categories which add capabilities to NSAttributedString 
+
+   Copyright (C) 1999 Free Software Foundation, Inc.
+
+   Author: Richard Frith-Macdonald <richard@brainstorm.co.uk>
+   Date: July 1999
+   Modifications: Fred Kiefer <FredKiefer@gmx.de>
+   Date: June 2000
+   
+   This file is part of the GNUstep GUI Library.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Library General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later version.
+   
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Library General Public License for more details.
+
+   You should have received a copy of the GNU Library General Public
+   License along with this library; see the file COPYING.LIB.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/ 
+
 #include <AppKit/NSAttributedString.h>
 #include <AppKit/NSParagraphStyle.h>
 #include <AppKit/NSTextAttachment.h>
 #include <AppKit/NSFont.h>
 #include <AppKit/NSColor.h>
+// For the colour name spaces
+#include <AppKit/NSGraphics.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSRange.h>
 #include "Parsers/rtfConsumer.h"
@@ -885,7 +917,8 @@ documentAttributes: (NSDictionary**)dict
       [result appendString: @"{\\colortbl;"];
       for (i = 0; i < count; i++)
 	{
-	  NSColor *color = [list objectAtIndex: i];
+	  NSColor *color = [[list objectAtIndex: i] 
+			       colorUsingColorSpaceName: NSCalibratedRGBColorSpace];
 	  [result appendString: [NSString stringWithFormat:
 					    @"\\red%d\\green%d\\blue%d;",
 					  (int)([color redComponent]*255),