diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 5dfe20fb91..7331bccd40 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-04  Tor Lillqvist  <tml@novell.com>
+
+	* gdk/tmpl/threads.sgml: Mention that the Win32 backend should not
+	be used from multiple threads.
+
 2006-03-31  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtk-sections.txt: Updates
diff --git a/docs/reference/gdk/tmpl/threads.sgml b/docs/reference/gdk/tmpl/threads.sgml
index c973ef9484..0400280ca2 100644
--- a/docs/reference/gdk/tmpl/threads.sgml
+++ b/docs/reference/gdk/tmpl/threads.sgml
@@ -22,6 +22,11 @@ which protects all use of GTK+. That is, only one thread can use GTK+
 at any given time.
 </para>
 <para>
+Unfortunately the above holds with the X11 backend only. With the
+Win32 backend, GDK calls should not be attempted from multiple threads
+at all.
+</para>
+<para>
 You must call g_thread_init() and gdk_threads_init() before executing
 any other GTK+ or GDK functions in a threaded GTK+ program.
 </para>