diff --git a/ChangeLog b/ChangeLog
index d912ba4c39..252d31e687 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-21  Behdad Esfahbod  <behdad@gnome.org>
+
+	* gdk/x11/gdksettings.c (gdk_settings_names, gdk_settings_map): Add
+	Gtk/EnableAccels and Gtk/EnableMnemonics xsettings for
+	gtk-enable-accels and gtk-enable-mnemonics GtkSettings respectively.
+	(#436536, Tommi Komulainen)
+
 2007-11-21  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktoolbar.c: Fix the default value of the toolbar-style
diff --git a/gdk/x11/gdksettings.c b/gdk/x11/gdksettings.c
index 654998d7a2..0f5fc367bb 100644
--- a/gdk/x11/gdksettings.c
+++ b/gdk/x11/gdksettings.c
@@ -65,7 +65,9 @@ static const char gdk_settings_names[] =
   "Xft/RGBA\0"                "gtk-xft-rgba\0"
   "Xft/DPI\0"                 "gtk-xft-dpi\0"
   "Net/FallbackIconTheme\0"   "gtk-fallback-icon-theme\0"
-  "Gtk/TouchscreenMode\0"     "gtk-touchscreen-mode\0";
+  "Gtk/TouchscreenMode\0"     "gtk-touchscreen-mode\0"
+  "Gtk/EnableAccels\0"        "gtk-enable-accels\0"
+  "Gtk/EnableMnemonics\0"     "gtk-enable-mnemonics\0";
 
 static const struct
 {
@@ -107,5 +109,7 @@ static const struct
   { 1197, 1206 },
   { 1219, 1227 },
   { 1239, 1261 },
-  { 1285, 1305 }
+  { 1285, 1305 },
+  { 1326, 1343 },
+  { 1361, 1381 }
 };