diff --git a/ChangeLog b/ChangeLog
index 00fd8ad..60f56e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-08 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/x11/XGServerEvent.m: Fix incorrect setting for second help
+	key.
+	* Documentation/Back/DefaultsSummary.gsdoc: Document mappings of
+	X keys to help keys.
+
 2006-11-25  Matt Rice  <ratmice@gmail.com>
 
 	* Source/art/ftfont.m (appendBezierPathWithGlyphs:count:toPath:):
diff --git a/Documentation/Back/DefaultsSummary.gsdoc b/Documentation/Back/DefaultsSummary.gsdoc
index 88b3bf2..6adfe1f 100644
--- a/Documentation/Back/DefaultsSummary.gsdoc
+++ b/Documentation/Back/DefaultsSummary.gsdoc
@@ -144,9 +144,10 @@
 	  <term>Keyboard Modifiers</term>
 	  <desc>
           <p>
-          The OPENstep specification requires 3 main different
+          The OPENstep specification requires three main different
           keyboard modifiers: <code>CONTROL</code>,
-          <code>COMMAND</code> and <code>ALTERNATE</code>. Some systems
+          <code>COMMAND</code> and <code>ALTERNATE</code> as well as
+	  the <code>HELP</code> modifier for context help. Some systems
           may not have these set up correctly. You can changed the defaults
           with the default keys.
           </p>
@@ -157,6 +158,8 @@
 	      <item>GSSecondCommandKey</item>
 	      <item>GSFirstAlternateKey</item>
 	      <item>GSSecondAlternateKey</item>
+	      <item>GSFirstHelpKey</item>
+	      <item>GSSecondHelpKey</item>
 	    </list>
           <p>
           Default values are respectively:
@@ -168,6 +171,8 @@
 	      <item>NoSymbol</item>
 	      <item>Alt_R</item>
 	      <item>NoSymbol</item>
+	      <item>Help</item>
+	      <item>Super_L</item>
 	    </list>
           <p>
           These strings correspond to "keysyms" on X11 systems.  On X11,
diff --git a/Source/x11/XGServerEvent.m b/Source/x11/XGServerEvent.m
index 32be6e3..51f4b6c 100644
--- a/Source/x11/XGServerEvent.m
+++ b/Source/x11/XGServerEvent.m
@@ -1678,7 +1678,7 @@ initialize_keyboard (void)
     _help_keysyms[0] = NoSymbol;
 
   _help_keysyms[1] = key_sym_from_defaults(display, defaults,
-                                          @"GSSecondAlternateKey",
+                                          @"GSSecondHelpKey",
                                           XK_Super_L);
 
   if (_help_keysyms[0] == _help_keysyms[1])