diff --git a/ChangeLog b/ChangeLog
index 2684ed2ad..3c6d1870e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug 18 17:27:09 2005  Søren Sandmann  <sandmann@redhat.com>
+
+	* fb/Makefile.am (libfbmmx_la_CFLAGS): Move fbmmx to a convenience
+	library since the mmx flags may be harmful when applied to non-mmx
+	code.
+
 Wed Aug 17 14:54:49 2005  Søren Sandmann  <sandmann@redhat.com>
 
 	* Xext/Makefile.am: Conditionally compile in xprint.c
diff --git a/fb/Makefile.am b/fb/Makefile.am
index 7c8dce107..061dd70f5 100644
--- a/fb/Makefile.am
+++ b/fb/Makefile.am
@@ -1,14 +1,26 @@
-noinst_LTLIBRARIES = libfb.la
+noinst_LTLIBRARIES = libfb.la libfbmmx.la
 
 AM_CFLAGS = $(DIX_CFLAGS)
 
 sdk_HEADERS = fb.h fbrop.h fbpseudocolor.h fboverlay.h
 
 if MMX_CAPABLE
-AM_CFLAGS += -mmmx -msse -Winline --param inline-unit-growth=10000 \
-        --param large-function-growth=10000 -DUSE_MMX
+AM_CFLAGS += -DUSE_MMX
+
+libfbmmx_la_CFLAGS =				\
+	$(DIX_CFLAGS)				\
+	-DUSE_MMX				\
+	-mmmx					\
+	-msse					\
+	-Winline				\
+	--param inline-unit-growth=10000	\
+        --param large-function-growth=10000
 endif
 
+libfbmmx_la_SOURCES =	\
+	fbmmx.c		\
+	fbmmx.h
+
 libfb_la_SOURCES = 	\
 	fb.h		\
 	fb24_32.c	\
@@ -49,8 +61,8 @@ libfb_la_SOURCES = 	\
 	fbpseudocolor.c \
 	fbpseudocolor.h \
 	fbedge.c	\
-	fbedgeimp.h	\
-	fbmmx.c		\
-	fbmmx.h
+	fbedgeimp.h
+
+libfb_la_LIBADD = libfbmmx.la
 
 EXTRA_DIST = fbcmap.c