diff --git a/ChangeLog b/ChangeLog
index f2b9139a57..a235fbc059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_set_app_paintable): Add some docs
+	about RGBA windows. (#326486, Benjamin Otte)
+
 2006-01-12  Michael Natterer  <mitch@imendio.com>
 
 	* gdk/gdkimage.c (scratch_image_info_for_depth): connect to the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index f2b9139a57..a235fbc059 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-01-12  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtkwidget.c (gtk_widget_set_app_paintable): Add some docs
+	about RGBA windows. (#326486, Benjamin Otte)
+
 2006-01-12  Michael Natterer  <mitch@imendio.com>
 
 	* gdk/gdkimage.c (scratch_image_info_for_depth): connect to the
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index ac936d240c..39bbcb439c 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4308,6 +4308,15 @@ gtk_widget_set_state (GtkWidget           *widget,
  * the effect is to suppress default themed drawing of the widget's 
  * background. (Children of the widget will still be drawn.) The application 
  * is then entirely responsible for drawing the widget background.
+ *
+ * Note that the background is still drawn when the widget is mapped.
+ * If this is not suitable (e.g. because you want to make a transparent
+ * window using an RGBA visual), you can work around this by doing:
+ * <informalexample><programlisting>
+ *  gtk_widget_realize (window);
+ *  gdk_window_set_back_pixmap (window->window, NULL, FALSE);
+ *  gtk_widget_show (window);
+ * </programlisting></informalexample> 
  **/
 void
 gtk_widget_set_app_paintable (GtkWidget *widget,