diff --git a/ChangeLog b/ChangeLog
index 2d6e1a18a..b7538b00d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 	unprivileged users can set the modulepath and run arbitrary code.
 	Patch from Matthieu Herrb.  (CVE-2006-0745, Coverity #4)
 
+	* cfb/cfbrrop.h:
+	Bug #5549: Fix build for sparc64.  (Matthieu Herrb)
+
 2006-03-16  Kristian Høgsberg  <krh@redhat.com>
 
 	* configure.ac: Check for glproto when building GLX and make sure
diff --git a/cfb/cfbrrop.h b/cfb/cfbrrop.h
index 6deb7b899..9e7a44c5b 100644
--- a/cfb/cfbrrop.h
+++ b/cfb/cfbrrop.h
@@ -284,6 +284,7 @@ in this Software without prior written authorization from The Open Group.
 #define RROP_UNROLL_CASE4(p,i)    RROP_UNROLL_CASE2(p,(i)+2) RROP_UNROLL_CASE2(p,i)
 #define RROP_UNROLL_CASE8(p,i)    RROP_UNROLL_CASE4(p,(i)+4) RROP_UNROLL_CASE4(p,i)
 #define RROP_UNROLL_CASE16(p,i)   RROP_UNROLL_CASE8(p,(i)+8) RROP_UNROLL_CASE8(p,i)
+#define RROP_UNROLL_CASE32(p,i)   RROP_UNROLL_CASE16(p,(i)+16) RROP_UNROLL_CASE16(p,i)
 #define RROP_UNROLL_CASE3(p)	RROP_UNROLL_CASE2(p,2) RROP_UNROLL_CASE1(p,1)
 #define RROP_UNROLL_CASE7(p)	RROP_UNROLL_CASE4(p,4) RROP_UNROLL_CASE3(p)
 #define RROP_UNROLL_CASE15(p)	RROP_UNROLL_CASE8(p,8) RROP_UNROLL_CASE7(p)