diff --git a/ChangeLog b/ChangeLog
index 5a481fae1..f36f82e0c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-29 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/AppKit/NSLayoutManager.h,
+	* Source/NSLayoutManager.m: Correction of the declarations for the methods
+	to handle temporary attributes.
+
 2010-08-29 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/GSGModelLoader.m: Add hack to get GModel loading working again.
diff --git a/Headers/AppKit/NSLayoutManager.h b/Headers/AppKit/NSLayoutManager.h
index 4c42afa14..971ad0415 100644
--- a/Headers/AppKit/NSLayoutManager.h
+++ b/Headers/AppKit/NSLayoutManager.h
@@ -190,14 +190,30 @@ GNUstep extension.
 @end
 
 @interface NSLayoutManager (temporaryattributes)
-- (void) addTemporaryAttributes: (NSDictionary *)attrs forCharacterRange: (NSRange)range;
-- (void) addTemporaryAttribute: (NSString *)attr value: (id)value forCharacterRange: (NSRange)range;
-- (void) setTemporaryAttributes:forCharacterRange: (NSRange)range;
-- (void) removeTemporaryAttribute: (NSString *)attr forCharacterRange: (NSRange)range;
-- (id) temporaryAttribute: (NSString *)attr atCharacterIndex: (unsigned int)index effectiveRange: (NSRange)range;
-- (id) temporaryAttribute: (NSString *)attr atCharacterIndex: (unsigned int)index longestEffectiveRange: (NSRange*)longestRange inRange: (NSRange)range;
-- (NSDictionary *) temporaryAttributesAtCharacterIndex: (unsigned int)index effectiveRange: (NSRange)range;
-- (NSDictionary *) temporaryAttributesAtCharacterIndex: (unsigned int) longestEffectiveRange: (NSRange*)longestRange inRange: (NSRange)range;
+- (void) addTemporaryAttributes: (NSDictionary *)attrs 
+              forCharacterRange: (NSRange)range;
+- (void) removeTemporaryAttribute: (NSString *)attr 
+                forCharacterRange: (NSRange)range;
+- (void) setTemporaryAttributes: (NSDictionary *)attrs 
+              forCharacterRange: (NSRange)range;
+- (NSDictionary *) temporaryAttributesAtCharacterIndex: (NSUInteger)index 
+                                        effectiveRange: (NSRange*)range;
+
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_5, GS_API_LATEST)
+- (void) addTemporaryAttribute: (NSString *)attr 
+                         value: (id)value 
+             forCharacterRange: (NSRange)range;
+- (id) temporaryAttribute: (NSString *)attr 
+         atCharacterIndex: (NSUInteger)index 
+           effectiveRange: (NSRange*)range;
+- (id) temporaryAttribute: (NSString *)attr 
+         atCharacterIndex: (NSUInteger)index 
+    longestEffectiveRange: (NSRange*)longestRange 
+                  inRange: (NSRange)range;
+- (NSDictionary *) temporaryAttributesAtCharacterIndex: (NSUInteger)index
+                                 longestEffectiveRange: (NSRange*)longestRange 
+                                               inRange: (NSRange)range;
+#endif
 @end
 #endif
 
diff --git a/Source/NSLayoutManager.m b/Source/NSLayoutManager.m
index e32ac4680..8591ee2d4 100644
--- a/Source/NSLayoutManager.m
+++ b/Source/NSLayoutManager.m
@@ -2369,40 +2369,52 @@ no_soft_invalidation:
   // to be implemented
 }
 
-- (void) addTemporaryAttribute: (NSString *)attr value: (id)value forCharacterRange: (NSRange)range
+- (void) addTemporaryAttribute: (NSString *)attr 
+                         value: (id)value 
+             forCharacterRange: (NSRange)range
 {
   // to be implemented
 }
 
-- (void) setTemporaryAttributes:forCharacterRange: (NSRange)range
+- (void) setTemporaryAttributes: (NSDictionary *)attrs 
+              forCharacterRange: (NSRange)range
 {
   // to be implemented
 }
 
-- (void) removeTemporaryAttribute: (NSString *)attr forCharacterRange: (NSRange)range
+- (void) removeTemporaryAttribute: (NSString *)attr 
+                forCharacterRange: (NSRange)range
 {
   // to be implemented
 }
 
-- (id) temporaryAttribute: (NSString *)attr atCharacterIndex: (unsigned int)index effectiveRange: (NSRange)range
+- (id) temporaryAttribute: (NSString *)attr 
+         atCharacterIndex: (NSUInteger)index 
+           effectiveRange: (NSRange*)range
 {
   // to be implemented
   return nil;
 }
 
-- (id) temporaryAttribute: (NSString *)attr atCharacterIndex: (unsigned int)index longestEffectiveRange: (NSRange*)longestRange inRange: (NSRange)range
+- (id) temporaryAttribute: (NSString *)attr 
+         atCharacterIndex: (NSUInteger)index 
+    longestEffectiveRange: (NSRange*)longestRange 
+                  inRange: (NSRange)range
 {
   // to be implemented
   return nil;
 }
 
-- (NSDictionary *) temporaryAttributesAtCharacterIndex: (unsigned int)index effectiveRange: (NSRange)range
+- (NSDictionary *) temporaryAttributesAtCharacterIndex: (NSUInteger)index 
+                                        effectiveRange: (NSRange*)longestRange
 {
   // to be implemented
   return nil;
 }
 
-- (NSDictionary *) temporaryAttributesAtCharacterIndex: (unsigned int) longestEffectiveRange: (NSRange*)longestRange inRange: (NSRange)range
+- (NSDictionary *) temporaryAttributesAtCharacterIndex: (NSUInteger)index
+                                 longestEffectiveRange: (NSRange*)longestRange 
+                                               inRange: (NSRange)range
 {
   // to be implemented
   return nil;