diff --git a/plug-ins/script-fu/scripts/spyrogimp.scm b/plug-ins/script-fu/scripts/spyrogimp.scm
index 445b498..1e8f449 100644
--- a/plug-ins/script-fu/scripts/spyrogimp.scm
+++ b/plug-ins/script-fu/scripts/spyrogimp.scm
@@ -25,7 +25,7 @@
                              type shape
                              oteeth iteeth
                              margin hole-ratio start-angle
-                             tool brush
+                             tool brush-radius paint-mode
                              color-method color grad)
 
   ; Internal function to draw the spyro.
@@ -37,7 +37,8 @@
                margin hole-ratio
                start-angle   ; 0 <= start-angle < 360 .
                tool          ; = 0 (Pencil), 1 (Brush), 2 (Airbrush) .
-               brush
+               brush-radius
+	       paint-mode
                color-method  ; = 0 (Single color), 1 (Grad. Loop Sawtooth),
                              ;   2 (Grad. Loop triangle) .
                color         ; Used when color-method = Single color .
@@ -101,6 +102,7 @@
 
 
     (let* (
+	  (brush-name (car (gimp-brush-new "Spyrogimp brush")))
           (steps (+ 1 (lcm oteeth iteeth)))
           (*points* (cons-array (* steps 2) 'double))
 
@@ -233,9 +235,16 @@
 
       ; Set new color, brush, opacity, paint mode.
       (gimp-context-set-foreground color)
-      (gimp-context-set-brush (car brush))
-      (gimp-context-set-opacity (* 100 (car (cdr brush))))
-      (gimp-context-set-paint-mode (car (cdr (cdr (cdr brush)))))
+      (gimp-brush-set-shape brush-name BRUSH-GENERATED-CIRCLE)
+      (gimp-brush-set-spikes brush-name 2)
+      (gimp-brush-set-hardness brush-name 1)
+      (gimp-brush-set-spacing brush-name 25)
+      (gimp-brush-set-aspect-ratio brush-name 1)
+      (gimp-brush-set-angle brush-name 0)
+      (gimp-brush-set-radius brush-name brush-radius)
+      (gimp-context-set-opacity 100)
+      (gimp-context-set-paint-mode paint-mode)
+      (gimp-context-set-brush brush-name)
 
       (gimp-progress-set-text _"Rendering Spyro")
 
@@ -279,6 +288,7 @@
 
       (gimp-progress-update 1.0)
 
+      (gimp-brush-delete brush-name)
       (gimp-image-undo-group-end img)
       (gimp-displays-flush)
 
@@ -303,7 +313,7 @@
              type shape
              oteeth iteeth
              margin hole-ratio start-angle
-             tool brush
+             tool brush-radius paint-mode
              color-method color grad)
   )
 )
@@ -342,7 +352,8 @@
   SF-OPTION     _"Tool"          '(_"Pencil"
                                    _"Brush"
                                    _"Airbrush")
-  SF-BRUSH      _"Brush"         '("Circle (01)" 1.0 -1 0)
+  SF-ADJUSTMENT _"Brush radius"  '(0.5 0.0 100.0 0.01 0.1 2 0)
+  SF-ENUM       _"Paint mode"    '("GimpLayerModeEffects" "normal-mode")
 
   SF-OPTION     _"Color method"  '(_"Solid Color"
                                    _"Gradient: Loop Sawtooth"
