diff --git a/ChangeLog b/ChangeLog
index ed9f10d733..93823c0255 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-08  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* docs/manual/appendix-integration.xml:
+	* docs/manual/basics-init.xml:
+	  Call g_thread_init() before g_option_context_new() to
+	  avoid warnings. Spotted by Ritesh Khadgaray. Fixes #484225.
+
 2007-10-08  Wim Taymans  <wim.taymans@gmail.com>
 
 	* libs/gst/base/gstbasesink.c: (gst_base_sink_preroll_queue_flush),
diff --git a/docs/manual/appendix-integration.xml b/docs/manual/appendix-integration.xml
index 020d55b38a..0979601b33 100644
--- a/docs/manual/appendix-integration.xml
+++ b/docs/manual/appendix-integration.xml
@@ -105,6 +105,11 @@ main (gint argc, gchar **argv)
   GOptionGroup *gstreamer_group;
   GnomeProgram *program;
 
+  /* we must initialise the threading system before using any
+   * other GLib funtion, such as g_option_context_new() */
+  if (!g_thread_supported ())
+    g_thread_init (NULL);
+
   context = g_option_context_new ("gnome-demo-app");
 
   /* get command line options from GStreamer and add them to the group */
diff --git a/docs/manual/basics-init.xml b/docs/manual/basics-init.xml
index 11f13034f8..5d57d3a166 100644
--- a/docs/manual/basics-init.xml
+++ b/docs/manual/basics-init.xml
@@ -96,6 +96,11 @@ main (int   argc,
     { NULL }
   };
 
+  /* we must initialise the threading system before using any
+   * other GLib funtion, such as g_option_context_new() */
+  if (!g_thread_supported ())
+    g_thread_init (NULL);
+
   ctx = g_option_context_new ("- Your application");
   g_option_context_add_main_entries (ctx, entries, NULL);
   g_option_context_add_group (ctx, gst_init_get_option_group ());