diff --git a/ChangeLog b/ChangeLog
index 7fec525dc7..ba1bfdd6c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-06-25  Michael Natterer  <mitch@gimp.org>
+
+	* app/actions/context-actions.c: added GIMP_ACTION_SELECT_SET
+	actions which set a generated brush's properties directly.
+
+	* app/actions/context-commands.c: adjust the range of possible
+	brush radius and aspect_ratio values to be actually usable.
+
 2004-06-25  Michael Natterer  <mitch@gimp.org>
 
 	* app/core/gimpbrushgenerated.[ch]: reordered parameters and
diff --git a/app/actions/context-actions.c b/app/actions/context-actions.c
index 06839e09fa..81ebd249b9 100644
--- a/app/actions/context-actions.c
+++ b/app/actions/context-actions.c
@@ -409,6 +409,10 @@ static GimpEnumActionEntry context_font_select_actions[] =
 
 static GimpEnumActionEntry context_brush_radius_actions[] =
 {
+  { "context-brush-radius-set", NULL,
+    "Set Brush Radius", NULL, NULL,
+    GIMP_ACTION_SELECT_SET,
+    NULL },
   { "context-brush-radius-minimum", GTK_STOCK_GOTO_FIRST,
     "Minumum Radius", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST,
@@ -437,6 +441,10 @@ static GimpEnumActionEntry context_brush_radius_actions[] =
 
 static GimpEnumActionEntry context_brush_hardness_actions[] =
 {
+  { "context-brush-hardness-set", NULL,
+    "Set Brush Hardness", NULL, NULL,
+    GIMP_ACTION_SELECT_SET,
+    NULL },
   { "context-brush-hardness-minimum", GTK_STOCK_GOTO_FIRST,
     "Minumum Hardness", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST,
@@ -465,6 +473,10 @@ static GimpEnumActionEntry context_brush_hardness_actions[] =
 
 static GimpEnumActionEntry context_brush_aspect_actions[] =
 {
+  { "context-brush-aspect-set", NULL,
+    "Set Brush Aspect", NULL, NULL,
+    GIMP_ACTION_SELECT_SET,
+    NULL },
   { "context-brush-aspect-minimum", GTK_STOCK_GOTO_FIRST,
     "Minumum Aspect", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST,
@@ -493,6 +505,10 @@ static GimpEnumActionEntry context_brush_aspect_actions[] =
 
 static GimpEnumActionEntry context_brush_angle_actions[] =
 {
+  { "context-brush-angle-set", NULL,
+    "Set Brush Angle", NULL, NULL,
+    GIMP_ACTION_SELECT_SET,
+    NULL },
   { "context-brush-angle-minimum", GIMP_STOCK_FLIP_HORIZONTAL,
     "Horizontal", NULL, NULL,
     GIMP_ACTION_SELECT_FIRST,
diff --git a/app/actions/context-commands.c b/app/actions/context-commands.c
index 4f366f0ee1..c5f6e36d7f 100644
--- a/app/actions/context-commands.c
+++ b/app/actions/context-commands.c
@@ -276,7 +276,7 @@ context_brush_radius_cmd_callback (GtkAction *action,
 
       radius = action_select_value ((GimpActionSelectType) value,
                                     radius,
-                                    1.0, 4096.0,
+                                    1.0, 256.0,
                                     1.0, 10.0, FALSE);
       gimp_brush_generated_set_radius (generated, radius);
     }
@@ -328,7 +328,7 @@ context_brush_aspect_cmd_callback (GtkAction *action,
 
       aspect = action_select_value ((GimpActionSelectType) value,
                                     aspect,
-                                    1.0, 1000.0,
+                                    1.0, 20.0,
                                     1.0, 4.0, FALSE);
       gimp_brush_generated_set_aspect_ratio (generated, aspect);
     }