diff --git a/ChangeLog b/ChangeLog
index cf657d804..5685337c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-16  Elijah Newren  <newren gmail com>
+
+        * src/frames.c: improved rounding of rounded corners. Fixes #360542,
+	mostly.
+
 2006-10-30  Dan Mick  <dan.mick@sun.com>
 
 	* src/window.c: (__window_is_terminal): Fix strict focus
diff --git a/src/frames.c b/src/frames.c
index d5ccb6a34..0c70b01a1 100644
--- a/src/frames.c
+++ b/src/frames.c
@@ -793,7 +793,7 @@ meta_frames_apply_shapes (MetaFrames *frames,
 
       for (i=0; i<radius; i++)
         {
-          const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i))));
+          const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i)) + 0.5));
           xrect.x = 0;
           xrect.y = i;
           xrect.width = width;
@@ -810,7 +810,7 @@ meta_frames_apply_shapes (MetaFrames *frames,
 
       for (i=0; i<radius; i++)
         {
-          const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i))));
+          const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i)) + 0.5));
           xrect.x = new_window_width - width;
           xrect.y = i;
           xrect.width = width;
@@ -827,7 +827,7 @@ meta_frames_apply_shapes (MetaFrames *frames,
 
       for (i=0; i<radius; i++)
         {
-          const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i))));
+          const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i)) + 0.5));
           xrect.x = 0;
           xrect.y = new_window_height - i;
           xrect.width = width;
@@ -844,7 +844,7 @@ meta_frames_apply_shapes (MetaFrames *frames,
 
       for (i=0; i<radius; i++)
         {
-          const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i))));
+          const int width = 1 + (radius - floor(sqrt(radius*radius - (radius-i)*(radius-i)) + 0.5));
           xrect.x = new_window_width - width;
           xrect.y = new_window_height - i;
           xrect.width = width;