diff --git a/glib/goption.c b/glib/goption.c
index bf0e41c..b00f683 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -269,7 +269,8 @@ void g_option_context_free (GOptionContext *context)
  *
  * Enables or disables automatic generation of <option>--help</option> 
  * output. By default, g_option_context_parse() recognizes
- * <option>--help</option>, <option>-?</option>, <option>--help-all</option>
+ * <option>--help</option>, <option>-h</option>,
+ * <option>-?</option>, <option>--help-all</option>
  * and <option>--help-</option><replaceable>groupname</replaceable> and creates
  * suitable output to stdout. 
  *
@@ -562,6 +563,26 @@ group_list_has_visible_entires (GOptionContext *context,
   return FALSE;
 }
 
+static gboolean
+context_has_h_entry (GOptionContext *context)
+{
+  GList *list;
+  GOptionGroup *group;
+
+  for (list = context->groups; list != NULL; list = g_list_next (list))
+    {
+     gsize i;
+
+      group = (GOptionGroup*)list->data;
+      for (i = 0; i < group->n_entries; i++)
+        {
+          if (group->entries[i].short_name == 'h')
+            return TRUE;
+        }
+    }
+  return FALSE;
+}
+
 /**
  * g_option_context_get_help: 
  * @context: a #GOptionContext
@@ -593,6 +614,7 @@ g_option_context_get_help (GOptionContext *context,
   gboolean seen[256];
   const gchar *rest_description;
   GString *string;
+  guchar token;
 
   string = g_string_sized_new (1024);
 
@@ -612,7 +634,7 @@ g_option_context_get_help (GOptionContext *context,
     }
 
   g_string_append_printf (string, "%s\n  %s %s", 
-	                  _("Usage:"), g_get_prgname(), _("[OPTION...]"));
+	                  _("Usage:"), g_get_prgname (), _("[OPTION...]"));
 
   if (rest_description)
     {
@@ -714,9 +736,11 @@ g_option_context_get_help (GOptionContext *context,
   if (!group)
     {
       list = context->groups;
-      
+
+      token = context_has_h_entry (context) ? '?' : 'h';
+
       g_string_append_printf (string, "%s\n  -%c, --%-*s %s\n", 
-	                      _("Help Options:"), '?', max_length - 4, "help", 
+	                      _("Help Options:"), token, max_length - 4, "help", 
 	                      _("Show help options"));
       
       /* We only want --help-all when there are groups */
@@ -1700,9 +1724,10 @@ g_option_context_parse (GOptionContext   *context,
                   memset (nulled_out, 0, arg_length * sizeof (gboolean));
 		  for (j = 0; j < arg_length; j++)
 		    {
-		      if (context->help_enabled && arg[j] == '?')
-			print_help (context, TRUE, NULL);
-		      parsed = FALSE;
+		      if (context->help_enabled && (arg[j] == '?' ||
+                        (arg[j] == 'h' && context_has_h_entry (context))))
+                        print_help (context, TRUE, NULL);
+                      parsed = FALSE;
 		      if (context->main_group &&
 			  !parse_short_option (context, context->main_group,
 					       i, &new_i, arg[j],
