diff --git a/docs/reference/glib/glib-docs.xml b/docs/reference/glib/glib-docs.xml
index a21bfde98..e378fd956 100644
--- a/docs/reference/glib/glib-docs.xml
+++ b/docs/reference/glib/glib-docs.xml
@@ -85,7 +85,7 @@
     <xi:include href="xml/guri.xml" />
     <xi:include href="xml/ghostutils.xml" />
     <xi:include href="xml/shell.xml" />
-    <xi:include href="xml/option.xml" />
+    <xi:include href="xml/goptioncontext.xml" />
     <xi:include href="xml/patterns.xml" />
     <xi:include href="xml/gregex.xml" />
     <xi:include href="regex-syntax.xml" />
diff --git a/docs/reference/glib/glib-sections.txt.in b/docs/reference/glib/glib-sections.txt.in
index f617bbd4b..3703198bd 100644
--- a/docs/reference/glib/glib-sections.txt.in
+++ b/docs/reference/glib/glib-sections.txt.in
@@ -1353,7 +1353,7 @@ g_shell_error_quark
 
 <SECTION>
 <TITLE>Commandline option parser</TITLE>
-<FILE>option</FILE>
+<FILE>goptioncontext</FILE>
 GOptionError
 G_OPTION_ERROR
 GOptionArgFunc
diff --git a/glib/goption.c b/glib/goption.c
index 0b3a05e90..64aed7a03 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -20,7 +20,7 @@
  */
 
 /**
- * SECTION:option
+ * SECTION:goptioncontext
  * @Short_description: parses commandline options
  * @Title: Commandline option parser
  *