diff --git a/ChangeLog b/ChangeLog
index c4eda12c3..e7aa29fa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-28  Eric Anholt  <anholt@FreeBSD.org>
+
+	* fb/fbpict.h:
+	Fix a copy'n'paste-o that would result in mis-rounding of the results of
+	several composite operators in A and G channels.
+
 2005-12-28  Eric Anholt  <anholt@FreeBSD.org>
 
 	* Xext/shmint.h:
diff --git a/fb/fbpict.h b/fb/fbpict.h
index 665b92dd1..9546b134f 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -173,7 +173,7 @@
         x = (x + ((x >> 8) & 0xff00ff)) >> 8;                       \
         x &= 0xff00ff;                                              \
         x += (y >> 8) & 0xff00ff;                                   \
-        x |= 0x1000100 - ((t >> 8) & 0xff00ff);                     \
+        x |= 0x1000100 - ((x >> 8) & 0xff00ff);                     \
         x &= 0xff00ff;                                              \
         x <<= 8;                                                    \
         x += t;                                                     \