diff --git a/docs/changes.txt b/docs/changes.txt
index 80d6edda36..ecb9df4d06 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -199,3 +199,4 @@ wxOSX/Cocoa:
 - Add wxTE_{RIGHT,CENTER} support for multiline wxTextCtrl (Andreas Falkenhahn).
 - Don't leave wxSlider labels shown when the slider itself is hidden.
 - Don't generate wxEVT_TEXT_ENTER for controls without wxTE_PROCESS_ENTER.
+- Implement wxToolTip::SetDelay() (David Vanderson).
diff --git a/interface/wx/tooltip.h b/interface/wx/tooltip.h
index 61431d73e9..0e3d6de58d 100644
--- a/interface/wx/tooltip.h
+++ b/interface/wx/tooltip.h
@@ -54,7 +54,7 @@ public:
     /**
         Set the delay after which the tooltip appears.
 
-        @note May not be supported on all platforms (eg. wxCocoa).
+        @note May not be supported on all platforms.
     */
     static void SetDelay(long msecs);
 
diff --git a/src/osx/cocoa/tooltip.mm b/src/osx/cocoa/tooltip.mm
index becaaf0580..a41aa48501 100644
--- a/src/osx/cocoa/tooltip.mm
+++ b/src/osx/cocoa/tooltip.mm
@@ -23,6 +23,10 @@
 #include "wx/geometry.h"
 #include "wx/osx/uma.h"
 
+#if wxOSX_USE_COCOA_OR_CARBON
+    #include <Appkit/Appkit.h>
+#endif
+
 // FYI a link to help with implementing: http://www.cocoadev.com/index.pl?LittleYellowBox
 
 
@@ -59,8 +63,12 @@ void wxToolTip::Enable( bool WXUNUSED(flag) )
 {
 }
 
-void wxToolTip::SetDelay( long WXUNUSED(msecs) )
+void wxToolTip::SetDelay( long msecs )
 {
+#if wxOSX_USE_COCOA_OR_CARBON
+    [[NSUserDefaults standardUserDefaults] setObject: [NSNumber numberWithInt: msecs]
+                                              forKey: @"NSInitialToolTipDelay"];
+#endif
 }
 
 void wxToolTip::SetAutoPop( long WXUNUSED(msecs) )