diff --git a/ChangeLog b/ChangeLog
index 6f92eb675..8a5f9951a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-03  Adam Jackson  <ajax@freedesktop.org>
+
+	* fb/fbmmx.c:
+	Bug #6346: Build fix when using gcc -mno-sse. (Jonathan 
+	Adamczewski)
+
 2006-04-03  Daniel Stone  <daniel@freedesktop.org>
 
 	* xkb/xkbUtils.c:
diff --git a/fb/fbmmx.c b/fb/fbmmx.c
index db06ea208..d058ffae4 100644
--- a/fb/fbmmx.c
+++ b/fb/fbmmx.c
@@ -41,7 +41,9 @@
 #endif
 
 #include <mmintrin.h>
+#ifdef USE_SSE
 #include <xmmintrin.h> /* for _mm_shuffle_pi16 and _MM_SHUFFLE */
+#endif
 
 #ifdef RENDER