diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 2ca9ee03c2..e415274e4e 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,9 @@
+2008-05-27  Matthias Clasen  <mclasen@redhat.com>
+
+	Bug 531887 - GtkTooltips is deprecated, but what should I use?
+
+	* gtk/tmpl/gtktooltips.sgml: Add a hint for what to use instead
+
 2008-05-26  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtk-sections.txt: Additions
diff --git a/docs/reference/gtk/tmpl/gtktooltips.sgml b/docs/reference/gtk/tmpl/gtktooltips.sgml
index 1cf7ab54c3..2b32138556 100644
--- a/docs/reference/gtk/tmpl/gtktooltips.sgml
+++ b/docs/reference/gtk/tmpl/gtktooltips.sgml
@@ -6,6 +6,10 @@ Add tips to your widgets
 
 <!-- ##### SECTION Long_Description ##### -->
 <para>
+<link linkend="GtkToolTips"><type>GtkTooltips</type></link> has been deprecated in GTK+ 2.12, in favor of the new
+<link linkend="GtkToolTip"><type>GtkTooltip</type></link> API.
+</para>
+<para>
 Tooltips are the messages that appear next to a widget when the mouse pointer is held over it for a short amount of time. They are especially helpful for adding more verbose descriptions of things such as buttons in a toolbar.
 </para>
 <para>