diff --git a/ChangeLog b/ChangeLog
index 694158582..5920b71aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-19  Emmanuele Bassi  <ebassi@linux.intel.com>
+
+	* clutter/x11/clutter-backend-x11.c: Properly document the
+	usage of clutter_x11_set_display().
+
+	* clutter/x11/clutter-x11.h: clutter_x11_set_display() is
+	public API and should be declared in the header we install.
+
 2008-09-18  Neil Roberts  <neil@linux.intel.com>
 
 	Bug 1048 - SIGFPE in cogl_texture_set_region() with nvidia
diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c
index b8362f91d..3c8e345a7 100644
--- a/clutter/x11/clutter-backend-x11.c
+++ b/clutter/x11/clutter-backend-x11.c
@@ -411,8 +411,14 @@ clutter_x11_get_default_display (void)
  * clutter_x11_set_display:
  * @xdpy: pointer to a X display connection.
  *
- * Sets the display connection clutter should use; must be called
- * before clutter_init().
+ * Sets the display connection Clutter should use; must be called
+ * before clutter_init(), clutter_init_with_args() or other functions
+ * pertaining Clutter's initialization process.
+ *
+ * If you are parsing the command line arguments by retrieving Clutter's
+ * #GOptionGroup with clutter_get_option_group() and calling
+ * g_option_context_parse() yourself, you should also call
+ * clutter_x11_set_display() before g_option_context_parse().
  *
  * Since: 0.8
  */
diff --git a/clutter/x11/clutter-x11.h b/clutter/x11/clutter-x11.h
index b1c151604..e523bff24 100644
--- a/clutter/x11/clutter-x11.h
+++ b/clutter/x11/clutter-x11.h
@@ -118,26 +118,21 @@ void         clutter_x11_remove_filter (ClutterX11FilterFunc func,
 
 ClutterX11FilterReturn clutter_x11_handle_event (XEvent *xevent);
 
-void         clutter_x11_disable_event_retrieval (void);
+void     clutter_x11_set_display (Display *xdpy);
 
-gboolean     clutter_x11_has_event_retrieval (void);
+void     clutter_x11_disable_event_retrieval (void);
+gboolean clutter_x11_has_event_retrieval (void);
 
 ClutterStage *clutter_x11_get_stage_from_window (Window win);
 
-GSList*
-clutter_x11_get_input_devices (void);
+GSList* clutter_x11_get_input_devices (void);
 
-ClutterX11InputDeviceType
-clutter_x11_get_input_device_type (ClutterX11XInputDevice *device);
+ClutterX11InputDeviceType clutter_x11_get_input_device_type (ClutterX11XInputDevice *device);
 
-void
-clutter_x11_enable_xinput ();
+void     clutter_x11_enable_xinput (void);
+gboolean clutter_x11_has_xinput (void);
 
-gboolean
-clutter_x11_has_xinput (void);
-
-gboolean
-clutter_x11_has_composite_extension (void);
+gboolean clutter_x11_has_composite_extension (void);
 
 G_END_DECLS