diff --git a/ChangeLog b/ChangeLog
index 38768a50d..9ae0ebcee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-04-05  Ian Romanick <idr@us.ibm.com>
+
+	* fb/fbwindow.c:
+	Include fbmmx.h when USE_MMX is defined.  Fixes build problem on
+	x86-64 resulting from fbHaveMMX being a macro instead of a function
+	on that platform.
+
 2006-04-04  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/xfree86/xf8_16bpp/Makefile.am:
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 4c1c5463d..8f5355d06 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/fb/fbwindow.c,v 1.10 2006/02/10 22:00:21 anholt Exp $ */
+/* $XdotOrg: xserver/xorg/fb/fbwindow.c,v 1.11 2006/04/03 21:16:30 ajax Exp $ */
 /*
  * Id: fbwindow.c,v 1.1 1999/11/02 03:54:45 keithp Exp $
  *
@@ -32,6 +32,10 @@
 
 #include "fb.h"
 
+#ifdef USE_MMX
+#include "fbmmx.h"
+#endif
+
 Bool
 fbCreateWindow(WindowPtr pWin)
 {