diff --git a/ChangeLog b/ChangeLog
index 8f91a66911..321a042667 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-19  Michael Natterer  <mitch@gimp.org>
+
+	* app/actions/tools-actions.c (tools_alternative_actions): remove
+	the accelerator from the "Arbitrary Rotation" action, Shift+R
+	should switch to the rotate tool, not switch to the rotate tool
+	*and* select "Transform Layer" from the tool options.
+
 2006-10-19  Sven Neumann  <sven@gimp.org>
 
 	* plug-ins/script-fu/scripts/script-fu.init: don't load
diff --git a/app/actions/tools-actions.c b/app/actions/tools-actions.c
index 4af647f55e..bf5b3b98bc 100644
--- a/app/actions/tools-actions.c
+++ b/app/actions/tools-actions.c
@@ -101,7 +101,7 @@ static const GimpStringActionEntry tools_alternative_actions[] =
     GIMP_HELP_TOOL_BY_COLOR_SELECT },
 
   { "tools-rotate-arbitrary", GIMP_STOCK_TOOL_ROTATE,
-    N_("_Arbitrary Rotation..."), NULL, NULL,
+    N_("_Arbitrary Rotation..."), "", NULL,
     "gimp-rotate-layer",
     GIMP_HELP_TOOL_ROTATE }
 };
@@ -450,10 +450,6 @@ tools_actions_setup (GimpActionGroup *group)
                                         "tools-by-color-select-short");
   gtk_action_set_accel_path (action, "<Actions>/tools/tools-by-color-select");
 
-  action = gtk_action_group_get_action (GTK_ACTION_GROUP (group),
-                                        "tools-rotate-arbitrary");
-  gtk_action_set_accel_path (action, "<Actions>/tools/tools-rotate");
-
   gimp_action_group_add_enum_actions (group,
                                       tools_color_average_radius_actions,
                                       G_N_ELEMENTS (tools_color_average_radius_actions),