diff --git a/ChangeLog b/ChangeLog
index 7419f8482..7e1faf021 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-27 11:44-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Headers/AppKit/NSTabViewItem.h: Add _toolTip ivar.
+	* Source/NSTabViewItem.m: Add setToolTip:/toolTip methods.  These
+	methods were added in 10.6.
+
 2012-08-17  Fred Kiefer <FredKiefer@gmx.de>
 
 	Merged changes from gnustep_testplant_branch branch.
diff --git a/Headers/AppKit/NSTabViewItem.h b/Headers/AppKit/NSTabViewItem.h
index 75d8fd4ac..6b40c5697 100644
--- a/Headers/AppKit/NSTabViewItem.h
+++ b/Headers/AppKit/NSTabViewItem.h
@@ -52,6 +52,7 @@ typedef enum {
   NSView *_first_responder;
   NSTabView *_tabview;
   NSRect _rect; // cached
+  NSString *_toolTip;
 }
 - (id) initWithIdentifier:(id)identifier;
 
diff --git a/Source/NSTabViewItem.m b/Source/NSTabViewItem.m
index 814b66f97..0532fe6f2 100644
--- a/Source/NSTabViewItem.m
+++ b/Source/NSTabViewItem.m
@@ -276,4 +276,14 @@
   return _label;
 }
 
+- (void) setToolTip: (NSString *)toolTip
+{
+  ASSIGN(_toolTip,toolTip);
+}
+
+- (NSString *)toolTip
+{
+  return _toolTip;
+}
+
 @end