diff --git a/ChangeLog b/ChangeLog
index 91e5e658d..cddaba6b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-21  Stefan Kost  <ensonic@users.sf.net>
+
+	* gobject/gboxed.c:
+	* gobject/gclosure.c:
+	* gobject/genums.c:
+	* gobject/gvalue.c:
+	  Use file-names from the section file for SECTION: comments.
+
 2008-06-21  Stefan Kost  <ensonic@users.sf.net>
 
 	* docs/reference/gobject/tmpl/generic_values.sgml:
diff --git a/gobject/gboxed.c b/gobject/gboxed.c
index a4b09df00..1485f7316 100644
--- a/gobject/gboxed.c
+++ b/gobject/gboxed.c
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 /**
- * SECTION:GBoxed
+ * SECTION:gboxed
  * @Short_description: A mechanism to wrap opaque C structures registered by the type system
  * @See_also:#GParamSpecBoxed, g_param_spec_boxed()
  * 
diff --git a/gobject/gclosure.c b/gobject/gclosure.c
index 0a66c94d0..969117240 100644
--- a/gobject/gclosure.c
+++ b/gobject/gclosure.c
@@ -18,7 +18,7 @@
  * Boston, MA 02111-1307, USA.
  */
 /**
- * SECTION:Closures
+ * SECTION:gclosure
  * @Short_description: Functions as first-class objects
  * 
  * A #GClosure represents a callback supplied by the programmer. It will generally
diff --git a/gobject/genums.c b/gobject/genums.c
index 4c826a1bd..53365b63f 100644
--- a/gobject/genums.c
+++ b/gobject/genums.c
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 /**
- * SECTION:Enums and Flags
+ * SECTION:enumerations_flags
  * @Short_description: Enumeration and flags types
  * @See_also:#GParamSpecEnum, #GParamSpecFlags, g_param_spec_enum(), g_param_spec_flags(), 
  * <link linkend="glib-mkenums">glib-mkenums</link>
diff --git a/gobject/gvalue.c b/gobject/gvalue.c
index c3a413ccf..4e810d3ee 100644
--- a/gobject/gvalue.c
+++ b/gobject/gvalue.c
@@ -17,7 +17,7 @@
  * Boston, MA 02111-1307, USA.
  */
 /**
- * SECTION:Generic Values
+ * SECTION:generic_values
  * @Short_description: A polymorphic type that can hold values of any other type
  * @See_also: The fundamental types which all support #GValue operations and
  * thus can be used as a type initializer for g_value_init() are defined by