diff --git a/ChangeLog b/ChangeLog
index 299b594a70..3c13a358f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-22  Sven Neumann  <sven@gimp.org>
+
+	* plug-ins/common/wind.c (render_wind): fixed call to
+	gimp_drawable_mask_intersect() which was causing a crash as
+	reported in bug #516369.
+
 2008-02-21  Michael Natterer  <mitch@gimp.org>
 
 	* app/actions/plug-in-actions.c (plug_in_actions_history_changed):
diff --git a/plug-ins/common/wind.c b/plug-ins/common/wind.c
index a31d2c783d..4e924cf691 100644
--- a/plug-ins/common/wind.c
+++ b/plug-ins/common/wind.c
@@ -437,18 +437,21 @@ render_wind (GimpDrawable *drawable,
     }
   else
     {
-      if (gimp_drawable_mask_intersect (drawable->drawable_id, &x1, &y1, &x2, &y2))
+      if (gimp_drawable_mask_intersect (drawable->drawable_id,
+                                        &x1, &y1, &width, &height))
         {
           gimp_progress_init (_("Rendering wind"));
 
-          width = x2 - x1;
-          height = y2 - y1;
+          x2 = x1 + width;
+          y2 = y1 + height;
 
           gimp_pixel_rgn_init (&dest_region, drawable,
                                x1, y1, width, height, TRUE, TRUE);
         }
       else
-        return;
+        {
+          return;
+        }
     }
 
   gimp_pixel_rgn_init (&src_region, drawable,