diff --git a/ChangeLog b/ChangeLog
index 34110251a..ae2aa28ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-25  Thomas Thurman  <tthurman@gnome.org>
+
+	* src/include/all-keybindings.h: alt-F10 toggles maximisation,
+          alt-F5 only restores.  Also rename "unmaximize" to "restore".
+	* src/ui/frames.c: Rename "unmaximize" to "restore".
+          Closes #343824.
+
 2008-12-25  Frederic Peters  <fpeters@0d.be>
 
 	* src/core/main.c: (main): added call to g_thread_init(), as ORBit2
diff --git a/src/include/all-keybindings.h b/src/include/all-keybindings.h
index f441b8286..aa5095769 100644
--- a/src/include/all-keybindings.h
+++ b/src/include/all-keybindings.h
@@ -258,14 +258,14 @@ keybind (activate_window_menu, handle_activate_window_menu, 0,
 keybind (toggle_fullscreen, handle_toggle_fullscreen, 0, BINDING_PER_WINDOW,
         NULL,
         _("Toggle fullscreen mode"))
-keybind (toggle_maximized, handle_toggle_maximized, 0, BINDING_PER_WINDOW, NULL,
+keybind (toggle_maximized, handle_toggle_maximized, 0, BINDING_PER_WINDOW, "<Alt>F10",
         _("Toggle maximization state"))
 keybind (toggle_above, handle_toggle_above, 0, BINDING_PER_WINDOW, NULL,
         _("Toggle whether a window will always be visible over other windows"))
-keybind (maximize, handle_maximize, 0, BINDING_PER_WINDOW, "<Alt>F10",
+keybind (maximize, handle_maximize, 0, BINDING_PER_WINDOW, NULL,
         _("Maximize window"))
 keybind (unmaximize, handle_unmaximize, 0, BINDING_PER_WINDOW, "<Alt>F5",
-        _("Unmaximize window"))
+        _("Restore window"))
 keybind (toggle_shaded, handle_toggle_shaded, 0, BINDING_PER_WINDOW, NULL,
         _("Toggle shaded state"))
 keybind (minimize, handle_minimize, 0, BINDING_PER_WINDOW, "<Alt>F9",
diff --git a/src/ui/frames.c b/src/ui/frames.c
index 700e7471d..f4761d2a6 100644
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
@@ -1086,7 +1086,7 @@ show_tip_now (MetaFrames *frames)
       tiptext = _("Maximize Window");
       break;
     case META_FRAME_CONTROL_UNMAXIMIZE:
-      tiptext = _("Unmaximize Window");
+      tiptext = _("Restore Window");
       break;
     case META_FRAME_CONTROL_SHADE:
       tiptext = _("Roll Up Window");