diff --git a/ChangeLog b/ChangeLog
index 4fd3d59..618f211 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-07  Glynn Foster  <glynn.foster@sun.com>
+
+	* help/C/zenity.xml: Update docs to add the new goption
+	help stuff.
+	* src/option.c: Update to be in line with the documentation 
+	descriptions.
+
 2005-02-01  Glynn Foster  <glynn.foster@sun.com>
 
 	* src/notification.c, src/option.c: Patch from Chris
diff --git a/help/C/zenity.xml b/help/C/zenity.xml
index 7f7e365..3b06c7d 100644
--- a/help/C/zenity.xml
+++ b/help/C/zenity.xml
@@ -115,7 +115,7 @@
         <listitem><para>Calendar</para></listitem>
 	<listitem><para>File selection</para></listitem>
 	<listitem><para>List</para></listitem>
-	<listitem><para>Notification</para></listitem>
+	<listitem><para>Notification icon</para></listitem>
         <listitem><para>Message</para>
             <itemizedlist>
 	        <listitem><para>Error</para></listitem>
@@ -288,17 +288,115 @@
       <varlistentry>
         <term><option>--help</option></term>
 	<listitem>
-	  <para>Displays help text. You can also use -? to specify this option.</para>
+	  <para>Displays shortened help text.</para>
 	</listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><option>--usage</option></term>
+        <term><option>--help-all</option></term>
 	<listitem>
-	  <para>Displays brief usage text.</para>
+	  <para>Displays full help text for all dialogs.</para>
 	</listitem>
       </varlistentry>
-
+ 
+      <varlistentry>
+        <term><option>--help-general</option></term>
+	<listitem>
+	  <para>Displays help text for general dialog options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-calendar</option></term>
+	<listitem>
+	  <para>Displays help text for calendar dialog options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-entry</option></term>
+	<listitem>
+	  <para>Displays help text for text entry dialog options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-error</option></term>
+	<listitem>
+	  <para>Displays help text for error dialog options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-info</option></term>
+	<listitem>
+	  <para>Displays help text for information dialog options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-file-selection</option></term>
+	<listitem>
+	  <para>Displays help text for file selection dialog options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-list</option></term>
+	<listitem>
+	  <para>Displays help text for list dialog options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-notification</option></term>
+	<listitem>
+	  <para>Displays help text for notification icon options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-progress</option></term>
+	<listitem>
+	  <para>Displays help text for progress dialog options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-question</option></term>
+	<listitem>
+	  <para>Displays help text for question dialog options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-warning</option></term>
+	<listitem>
+	  <para>Displays help text for warning dialog options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-text-info</option></term>
+	<listitem>
+	  <para>Displays help for text information dialog options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-misc</option></term>
+	<listitem>
+	  <para>Displays help for miscellaneous options.</para>
+	</listitem>
+      </varlistentry>
+ 
+      <varlistentry>
+        <term><option>--help-gtk</option></term>
+	<listitem>
+	  <para>Displays help for GTK+ options.</para>
+	</listitem>
+      </varlistentry>
+ 
     </variablelist>
 
   </sect2>
diff --git a/src/option.c b/src/option.c
index cfc95e9..603ce04 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1257,8 +1257,8 @@ zenity_create_context (void)
   
   /* Adds notification option entries */
   a_group = g_option_group_new("notification", 
-                               N_("Notification options"), 
-                               N_("Show notification options"), NULL, 0);
+                               N_("Notification icon options"), 
+                               N_("Show notification icon options"), NULL, 0);
   g_option_group_add_entries(a_group, notification_options);
   g_option_group_set_parse_hooks (a_group,
                     zenity_notification_pre_callback, zenity_notification_post_callback);
@@ -1296,9 +1296,9 @@ zenity_create_context (void)
   g_option_context_add_group(tmp_ctx, a_group);
   
   /* Adds text option entries */
-  a_group = g_option_group_new("text", 
-                               N_("Text options"), 
-                               N_("Show text options"), NULL, 0);
+  a_group = g_option_group_new("text-info", 
+                               N_("Text information options"), 
+                               N_("Show text information options"), NULL, 0);
   g_option_group_add_entries(a_group, text_options);
   g_option_group_set_parse_hooks (a_group,
                     zenity_text_pre_callback, zenity_text_post_callback);