diff --git a/ChangeLog b/ChangeLog
index 61f66b000..d49cfd443 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-07-17 Enrico Sersale <enrico@fibernet.ro>
+	
+  * Headers/AppKit/NSHelpManager.h: 
+  * Source/NSHelpManager.m:
+  added -setContextHelp:forObject: as specified in Apple docs;
+  -setContextHelp:withObject: deprecated. 
+
 2006-07-16 Enrico Sersale <enrico@fibernet.ro>
 	
   * Headers/Additions/GNUstepGUI/GSHelpManagerPanel.h: added -buttonAction: 
diff --git a/Headers/AppKit/NSHelpManager.h b/Headers/AppKit/NSHelpManager.h
index c1da3a98c..cca9110d5 100644
--- a/Headers/AppKit/NSHelpManager.h
+++ b/Headers/AppKit/NSHelpManager.h
@@ -68,6 +68,8 @@
 
 - (void) removeContextHelpForObject: (id)object;
 
+- (void)setContextHelp:(NSAttributedString *)help forObject:(id)object;
+
 - (void) setContextHelp: (NSAttributedString*) help withObject: (id) object;
 
 - (BOOL) showContextHelpForObject: (id)object locationHint: (NSPoint) point;
diff --git a/Source/NSHelpManager.m b/Source/NSHelpManager.m
index 6291a8eab..8ecb2b5ce 100644
--- a/Source/NSHelpManager.m
+++ b/Source/NSHelpManager.m
@@ -284,6 +284,15 @@ static BOOL _gnu_contextHelpActive = NO;
   NSMapRemove(contextHelpTopics, object);
 }
 
+- (void)setContextHelp:(NSAttributedString *)help forObject:(id)object
+{
+  NSMapInsert(contextHelpTopics, object, help);
+}
+
+/**
+ * Deprecated ... do not use.
+ * Use -setContextHelp:forObject: instead.
+ */
 - (void) setContextHelp: (NSAttributedString*) help withObject: (id) object
 {
   NSMapInsert(contextHelpTopics, object, help);