diff --git a/ChangeLog b/ChangeLog
index a902294ce..6f92eb675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-03  Daniel Stone  <daniel@freedesktop.org>
+
+	* xkb/xkbUtils.c:
+	Bug #1358: Make ISO_Prev_Group cycle/wrap as ISO_Next_Group does.
+
 2006-04-02  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/dmx/glxProxy/glxcmds.c:
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index 70fb9e412..e9e9c2636 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -756,11 +756,11 @@ unsigned char	grp;
 
 
     grp= state->locked_group;
-    if (grp>=ctrls->num_groups)
+    if (grp>=ctrls->num_groups || grp < 0)
 	state->locked_group= XkbAdjustGroup(grp,ctrls);
 
     grp= state->locked_group+state->base_group+state->latched_group;
-    if (grp>=ctrls->num_groups)
+    if (grp>=ctrls->num_groups || grp < 0)
 	 state->group= XkbAdjustGroup(grp,ctrls);
     else state->group= grp;
     XkbComputeCompatState(xkbi);