diff --git a/clutter/clutter-stage-manager.c b/clutter/clutter-stage-manager.c
index 1d9401143..a5df50a02 100644
--- a/clutter/clutter-stage-manager.c
+++ b/clutter/clutter-stage-manager.c
@@ -1,3 +1,41 @@
+/*
+ * Clutter.
+ *
+ * An OpenGL based 'interactive canvas' library.
+ *
+ * Copyright (C) 2008 OpenedHand
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Emmanuele Bassi <ebassi@linux.intel.com>
+ */
+
+/**
+ * SECTION:clutter-stage-manager
+ * @short_description: Maintains the list of stages
+ *
+ * #ClutterStageManager is a singleton object, owned by Clutter, which
+ * maintains the list of currently active stages
+ *
+ * Every newly-created #ClutterStage will cause the emission of the
+ * #ClutterStageManager::stage-added signal; once a #ClutterStage has
+ * been destroyed, the #ClutterStageManager::stage-removed signal will
+ * be emitted
+ *
+ * #ClutterStageManager is available since Clutter 0.8
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -153,7 +191,6 @@ clutter_stage_manager_class_init (ClutterStageManagerClass *klass)
 static void
 clutter_stage_manager_init (ClutterStageManager *stage_manager)
 {
-
 }
 
 /**
@@ -185,20 +222,13 @@ clutter_stage_manager_get_default (void)
  * Sets @stage as the default stage.
  *
  * Since: 0.8
+ *
+ * Deprecated: 1.2: Calling this function has no effect
  */
 void
 clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
                                          ClutterStage        *stage)
 {
-  g_return_if_fail (CLUTTER_IS_STAGE_MANAGER (stage_manager));
-  g_return_if_fail (CLUTTER_IS_STAGE (stage));
-
-  if (!g_slist_find (stage_manager->stages, stage))
-    _clutter_stage_manager_add_stage (stage_manager, stage);
-
-  default_stage = stage;
-
-  g_object_notify (G_OBJECT (stage_manager), "default-stage");
 }
 
 /**
@@ -270,7 +300,7 @@ _clutter_stage_manager_add_stage (ClutterStageManager *stage_manager,
 
   stage_manager->stages = g_slist_append (stage_manager->stages, stage);
 
-  if (!default_stage)
+  if (G_UNLIKELY (default_stage == NULL))
     {
       default_stage = stage;
 
diff --git a/clutter/clutter-stage-manager.h b/clutter/clutter-stage-manager.h
index c8a36eca9..bb7ca6d68 100644
--- a/clutter/clutter-stage-manager.h
+++ b/clutter/clutter-stage-manager.h
@@ -3,8 +3,6 @@
  *
  * An OpenGL based 'interactive canvas' library.
  *
- * Authored By Matthew Allum  <mallum@openedhand.com>
- *
  * Copyright (C) 2008 OpenedHand
  *
  * This library is free software; you can redistribute it and/or
@@ -19,6 +17,8 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Author: Emmanuele Bassi <ebassi@linux.intel.com>
  */
 
 #if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
@@ -43,6 +43,18 @@ G_BEGIN_DECLS
 typedef struct _ClutterStageManager             ClutterStageManager;
 typedef struct _ClutterStageManagerClass        ClutterStageManagerClass;
 
+/**
+ * ClutterStageManagerClass;
+ * @stage_added: class handler for the #ClutterStageManager::stage-added
+ *   signal
+ * @stage_removed: class handler for the #ClutterStageManager::stage-removed
+ *   signal
+ *
+ * The #ClutterStageManagerClass structure contains only private data
+ * and should be accessed using the provided API
+ *
+ * Since: 1.0
+ */
 struct _ClutterStageManagerClass
 {
   /*< private >*/
@@ -57,12 +69,15 @@ struct _ClutterStageManagerClass
 GType clutter_stage_manager_get_type (void) G_GNUC_CONST;
 
 ClutterStageManager *clutter_stage_manager_get_default       (void);
-void                 clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
-                                                              ClutterStage        *stage);
 ClutterStage *       clutter_stage_manager_get_default_stage (ClutterStageManager *stage_manager);
 GSList *             clutter_stage_manager_list_stages       (ClutterStageManager *stage_manager);
 const GSList *       clutter_stage_manager_peek_stages       (ClutterStageManager *stage_manager);
 
+#ifndef CLUTTER_DISABLE_DEPRECATED
+void                 clutter_stage_manager_set_default_stage (ClutterStageManager *stage_manager,
+                                                              ClutterStage        *stage);
+#endif
+
 G_END_DECLS
 
 #endif /* __CLUTTER_STAGE_MANAGER_H__ */