diff --git a/ChangeLog b/ChangeLog
index 4cfde00d1..1266fcb4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-10-21  Tomas Frydrych  <tf@linux.intel.com>
+
+       * src/core/screen-bindings.h: Fix off-by-one error.
+       * src/core/window-bindings.h: Fix off-by-one error.
+       Closes #557201.
+
+2008-10-21  Tomas Frydrych  <tf@linux.intel.com>
+
+       * src/core/screen-bindings.h: Fix off-by-one error.
+       * src/core/window-bindings.h: Fix off-by-one error.
+       Closes #557201.
+
 2008-10-18  Thomas Thurman  <tthurman@gnome.org>
 
         During a discussion with Rodney Dawes about making life easier
diff --git a/src/core/screen-bindings.h b/src/core/screen-bindings.h
index 0d53a5ebe..09fb43e4a 100644
--- a/src/core/screen-bindings.h
+++ b/src/core/screen-bindings.h
@@ -92,40 +92,40 @@
 /* convenience, since in this file they must always be set together */
 #define REVERSES_AND_REVERSED (BINDING_REVERSES | BINDING_IS_REVERSED)
 
-item (switch_to_workspace, "_1", 1, 0,
+item (switch_to_workspace, "_1", 0, 0,
         _("Switch to workspace 1"),
         NULL)
-item (switch_to_workspace, "_2", 2, 0,
+item (switch_to_workspace, "_2", 1, 0,
         _("Switch to workspace 2"),
         NULL)
-item (switch_to_workspace, "_3", 3, 0,
+item (switch_to_workspace, "_3", 2, 0,
         _("Switch to workspace 3"),
         NULL)
-item (switch_to_workspace, "_4", 4, 0,
+item (switch_to_workspace, "_4", 3, 0,
         _("Switch to workspace 4"),
         NULL)
-item (switch_to_workspace, "_5", 5, 0,
+item (switch_to_workspace, "_5", 4, 0,
         _("Switch to workspace 5"),
         NULL)
-item (switch_to_workspace, "_6", 6, 0,
+item (switch_to_workspace, "_6", 5, 0,
         _("Switch to workspace 6"),
         NULL)
-item (switch_to_workspace, "_7", 7, 0,
+item (switch_to_workspace, "_7", 6, 0,
         _("Switch to workspace 7"),
         NULL)
-item (switch_to_workspace, "_8", 8, 0,
+item (switch_to_workspace, "_8", 7, 0,
         _("Switch to workspace 8"),
         NULL)
-item (switch_to_workspace, "_9", 9, 0,
+item (switch_to_workspace, "_9", 8, 0,
         _("Switch to workspace 9"),
         NULL)
-item (switch_to_workspace, "_10", 10, 0,
+item (switch_to_workspace, "_10", 9, 0,
         _("Switch to workspace 10"),
         NULL)
-item (switch_to_workspace, "_11", 11, 0,
+item (switch_to_workspace, "_11", 10, 0,
         _("Switch to workspace 11"),
         NULL)
-item (switch_to_workspace, "_12", 12, 0,
+item (switch_to_workspace, "_12", 11, 0,
         _("Switch to workspace 12"),
         NULL)
 
diff --git a/src/core/window-bindings.h b/src/core/window-bindings.h
index cb7188a99..f0cfcaa1d 100644
--- a/src/core/window-bindings.h
+++ b/src/core/window-bindings.h
@@ -127,40 +127,40 @@ item (toggle_on_all_workspaces, "", 0, BINDING_PER_WINDOW,
         _("Toggle whether window is on all workspaces or just one"),
           NULL)
 
-item (move_to_workspace, "_1", 1, BINDING_PER_WINDOW,
+item (move_to_workspace, "_1", 0, BINDING_PER_WINDOW,
         _("Move window to workspace 1"),
         NULL)
-item (move_to_workspace, "_2", 2, BINDING_PER_WINDOW,
+item (move_to_workspace, "_2", 1, BINDING_PER_WINDOW,
         _("Move window to workspace 2"),
         NULL)
-item (move_to_workspace, "_3", 3, BINDING_PER_WINDOW,
+item (move_to_workspace, "_3", 2, BINDING_PER_WINDOW,
         _("Move window to workspace 3"),
         NULL)
-item (move_to_workspace, "_4", 4, BINDING_PER_WINDOW,
+item (move_to_workspace, "_4", 3, BINDING_PER_WINDOW,
         _("Move window to workspace 4"),
         NULL)
-item (move_to_workspace, "_5", 5, BINDING_PER_WINDOW,
+item (move_to_workspace, "_5", 4, BINDING_PER_WINDOW,
         _("Move window to workspace 5"),
         NULL)
-item (move_to_workspace, "_6", 6, BINDING_PER_WINDOW,
+item (move_to_workspace, "_6", 5, BINDING_PER_WINDOW,
         _("Move window to workspace 6"),
         NULL)
-item (move_to_workspace, "_7", 7, BINDING_PER_WINDOW,
+item (move_to_workspace, "_7", 6, BINDING_PER_WINDOW,
         _("Move window to workspace 7"),
         NULL)
-item (move_to_workspace, "_8", 8, BINDING_PER_WINDOW,
+item (move_to_workspace, "_8", 7, BINDING_PER_WINDOW,
         _("Move window to workspace 8"),
         NULL)
-item (move_to_workspace, "_9", 9, BINDING_PER_WINDOW,
+item (move_to_workspace, "_9", 8, BINDING_PER_WINDOW,
         _("Move window to workspace 9"),
         NULL)
-item (move_to_workspace, "_10", 10, BINDING_PER_WINDOW,
+item (move_to_workspace, "_10", 9, BINDING_PER_WINDOW,
         _("Move window to workspace 10"),
         NULL)
-item (move_to_workspace, "_11", 11, BINDING_PER_WINDOW,
+item (move_to_workspace, "_11", 10, BINDING_PER_WINDOW,
         _("Move window to workspace 11"),
         NULL)
-item (move_to_workspace, "_12", 12, BINDING_PER_WINDOW,
+item (move_to_workspace, "_12", 11, BINDING_PER_WINDOW,
         _("Move window to workspace 12"),
         NULL)