diff --git a/glib/goption.c b/glib/goption.c
index bf0e41c..19bca7b 100644
--- a/glib/goption.c
+++ b/glib/goption.c
@@ -612,7 +612,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)
     {
@@ -716,7 +716,7 @@ g_option_context_get_help (GOptionContext *context,
       list = context->groups;
       
       g_string_append_printf (string, "%s\n  -%c, --%-*s %s\n", 
-	                      _("Help Options:"), '?', max_length - 4, "help", 
+	                      _("Help Options:"), 'h', max_length - 4, "help", 
 	                      _("Show help options"));
       
       /* We only want --help-all when there are groups */
@@ -1700,7 +1700,8 @@ 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] == '?')
+		      if (context->help_enabled &&
+                        (arg[j] == 'h' || arg[j] == '?'))
 			print_help (context, TRUE, NULL);
 		      parsed = FALSE;
 		      if (context->main_group &&
