diff --git a/configure.ac b/configure.ac
index a866784bdd..732fb26180 100644
--- a/configure.ac
+++ b/configure.ac
@@ -205,7 +205,7 @@ GST_PLUGINS_ALL="\
         mpegaudio mpegaudioparse mpegstream mpegtypes\
         passthrough playondemand rtjpeg silence sine\
         smooth spectrum speed stereo stereomono\
-        synaesthesia udp videoscale volenv volume vumeter wavparse y4m"
+        synaesthesia udp videoscale volenv volume vumeter wavparse y4m goom"
 
 AC_SUBST(GST_PLUGINS_ALL)
 
@@ -783,6 +783,7 @@ gst/volume/Makefile
 gst/vumeter/Makefile
 gst/wavparse/Makefile
 gst/y4m/Makefile
+gst/goom/Makefile
 sys/Makefile
 sys/oss/Makefile
 sys/qcam/Makefile
diff --git a/gst/goom/Makefile.am b/gst/goom/Makefile.am
index 26bc05a1a1..1440a5950f 100644
--- a/gst/goom/Makefile.am
+++ b/gst/goom/Makefile.am
@@ -2,12 +2,22 @@ plugindir = $(libdir)/gst
 
 plugin_LTLIBRARIES = libgstgoom.la
 
-libgstgoom_la_SOURCES = gstgoom.c goom_core.c filters.c filters_mmx.s graphic.c lines.c
+if HAVE_LIBMMX
+GOOM_FILTER_FILES = filters.c filters_mmx.s
+GOOM_FILTER_CFLAGS = -DMMX
+else
+GOOM_FILTER_FILES = filters.c
+GOOM_FILTER_CFLAGS = -UMMX
+endif
+
+libgstgoom_la_SOURCES = gstgoom.c goom_core.c $(GOOM_FILTER_FILES) graphic.c lines.c
 
 noinst_HEADERS = filters.h goom_core.h goom_tools.h graphic.h lines.h 
 
 #CFLAGS += -Wall -O3 -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math -DNDEBUG
-libgstgoom_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS) -DMMX
+libgstgoom_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS)
 libgstgoom_la_LIBADD = $(GST_LIBS)
 libgstgoom_la_LDFLAGS = @GST_PLUGIN_LDFLAGS@
 
+EXTRA_DIST = filters.c filters_mmx.s
+