diff --git a/BUGS b/BUGS
index 31690e6cc..18fcd5d7e 100644
--- a/BUGS
+++ b/BUGS
@@ -92,3 +92,8 @@ move_to_show_surface (see cairo/test):
  *   call to cairo_move_to to any coordinate other than 0,0. A little
  *   bit of poking around suggests this isn't a regression, (at least
  *   not since the last pixman snapshot).
+
+--
+
+cairo falls over with XFree86 4.2 (probably braindead depth handling
+somewhere).
diff --git a/ChangeLog b/ChangeLog
index 617e3aaad..26e6ca2f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,8 @@
 	stroked bounding box (shifted out by 0.5 units to just abut the
 	text), and increase position adjustments to make room for this
 	larger box.
+	(draw): Move x_off, y_off calculation outside of loop to emphasize
+	loop-independence.
 
 2004-11-08  Dave Beckett  <Dave.Beckett@bristol.ac.uk>