diff --git a/TODO b/TODO
index bfcbdf4c80..1c05ae5760 100644
--- a/TODO
+++ b/TODO
@@ -18,3 +18,7 @@
 * check options in a52, it has some arch stuff and some opti stuff that 
   looks dodgy
 
+* what to do with the perftest in mpeg2dec ?
+
+* riff: do we need those cflags ?
+
diff --git a/configure.ac b/configure.ac
index ba6888c3e6..e16dc67383 100644
--- a/configure.ac
+++ b/configure.ac
@@ -519,7 +519,8 @@ GST_CHECK_FEATURE(LIBMIKMOD, [mikmod plugin], mikmod, [
 dnl *** mpeg2dec ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_MPEG2DEC, true)
 GST_CHECK_FEATURE(MPEG2DEC, [mpeg2dec], mpeg2dec, [
-  GST_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init,, mpeg2dec/mpeg2.h, MPEG2DEC_LIBS="-lmpeg2")
+  GST_CHECK_LIBHEADER(MPEG2DEC, mpeg2, mpeg2_init,, mpeg2dec/mpeg2.h, MPEG2DEC_LIBS="-lmpeg2 -lmpeg2dec")
+  AC_SUBST(MPEG2DEC_LIBS)
 ])
 
 dnl *** quicktime ***
@@ -863,19 +864,6 @@ if test "x$HAVE_LIBDVDREAD" = xyes; then
   AC_DEFINE(HAVE_LIBDVDREAD)
 fi
 
-dnl FIXME: I think these can go
-if test "x$HAVE_LINUX_CDROM" = xyes; then
-  AC_DEFINE(HAVE_LINUX_CDROM)
-fi
-
-if test "x$HAVE_LINUX_VIDEODEV" = xyes; then
-  AC_DEFINE(HAVE_LINUX_VIDEODEV)
-fi
-
-if test "x$HAVE_MPEG2DEC" = xyes; then
-  AC_DEFINE(HAVE_MPEG2DEC)
-fi
-
 if test "x$HAVE_A52DEC" = xyes; then
   AC_DEFINE(HAVE_A52DEC)
 fi
@@ -907,8 +895,6 @@ AM_CONDITIONAL(EXPERIMENTAL,        test "$EXPERIMENTAL" = "$xyes")
 AM_CONDITIONAL(BROKEN,              test "$BROKEN" = "$xyes")
 
 AM_CONDITIONAL(HAVE_LIBMIKMOD,      test "x$HAVE_LIBMIKMOD" = "xyes")
-AM_CONDITIONAL(HAVE_LINUX_CDROM,    test "x$HAVE_LINUX_CDROM" = "xyes")
-AM_CONDITIONAL(HAVE_LINUX_VIDEODEV, test "x$HAVE_LINUX_VIDEODEV" = "xyes")
 AM_CONDITIONAL(HAVE_LIBDVDREAD,     test "x$HAVE_LIBDVDREAD" = "xyes")
 AM_CONDITIONAL(HAVE_LIBJPEG,        test "x$HAVE_LIBJPEG" = "xyes")
 AM_CONDITIONAL(HAVE_LIBSDL,         test "x$HAVE_LIBSDL" = "xyes")
@@ -929,7 +915,6 @@ AM_CONDITIONAL(HAVE_FIG2DEV_PNG,    $HAVE_FIG2DEV_PNG)
 AM_CONDITIONAL(HAVE_FIG2DEV_PDF,    $HAVE_FIG2DEV_PDF)
 AM_CONDITIONAL(HAVE_CDPARANOIA,     test "x$HAVE_CDPARANOIA" = "xyes")
 AM_CONDITIONAL(HAVE_LIBSHOUT,       test "x$HAVE_LIBSHOUT" = "xyes")
-AM_CONDITIONAL(HAVE_MPEG2DEC,       test "x$HAVE_MPEG2DEC" = "xyes")
 AM_CONDITIONAL(HAVE_A52DEC,         test "x$HAVE_A52DEC" = "xyes")
 AM_CONDITIONAL(HAVE_AVIFILE,        test "x$HAVE_AVIFILE" = "xyes")
 dnl thomas : the next line gives errors, this is how it is in CVS
@@ -1104,6 +1089,7 @@ gst-libs/Makefile
 gst-libs/gst/Makefile
 gst-libs/gst/audio/Makefile
 gst-libs/gst/resample/Makefile
+gst-libs/gst/riff/Makefile
 gst-plugins.spec
 )
 
diff --git a/ext/Makefile.am b/ext/Makefile.am
index b610baad59..87883f3c14 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -1,8 +1,8 @@
-#if USE_A52
-#A52_DIR=a52
-#else
-#A52_DIR=
-#endif
+if USE_A52
+A52_DIR=a52
+else
+A52_DIR=
+endif
 
 if USE_AALIB
 AALIB_DIR=aalib
@@ -41,7 +41,7 @@ MAD_DIR=
 endif
 
 if USE_MPEG2DEC
-MPEG2DEC_DIR=mad
+MPEG2DEC_DIR=mpeg2dec
 else
 MPEG2DEC_DIR=
 endif
@@ -58,10 +58,8 @@ else
 VORBIS_DIR=
 endif
 
-#$A52_DIR
-SUBDIRS=$(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \
-        $(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR) \
+SUBDIRS=$(A52_DIR) $(AALIB_DIR) $(ALSA_DIR) $(AUDIOFILE_DIR) $(ESD_DIR) \
+        $(LAME_DIR) $(MAD_DIR) $(MPEG2DEC_DIR)\
 	$(SDL_DIR) $(VORBIS_DIR)
 
-#a52
-DIST_SUBDIRS=aalib alsa audiofile esd lame mad mpeg2dec sdl vorbis
+DIST_SUBDIRS=a52 aalib alsa audiofile esd lame mad mpeg2dec sdl vorbis
diff --git a/gst/avi/gstaviaudiodecoder.h b/gst/avi/gstaviaudiodecoder.h
index 0f98c2362a..dce4fc99a6 100644
--- a/gst/avi/gstaviaudiodecoder.h
+++ b/gst/avi/gstaviaudiodecoder.h
@@ -24,7 +24,7 @@
 
 #include <config.h>
 #include <gst/gst.h>
-#include <libs/riff/gstriff.h>
+#include <gst/riff/riff.h>
 
 
 #ifdef __cplusplus
diff --git a/gst/avi/gstavidemux.h b/gst/avi/gstavidemux.h
index d06172be97..4703aad0d2 100644
--- a/gst/avi/gstavidemux.h
+++ b/gst/avi/gstavidemux.h
@@ -24,8 +24,8 @@
 
 #include <config.h>
 #include <gst/gst.h>
-#include <libs/riff/gstriff.h>
-#include <libs/bytestream/gstbytestream.h>
+#include <gst/riff/riff.h>
+#include <gst/bytestream/bytestream.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/gst/avi/gstavimux.h b/gst/avi/gstavimux.h
index 9de569414c..d21566eaf0 100644
--- a/gst/avi/gstavimux.h
+++ b/gst/avi/gstavimux.h
@@ -24,7 +24,7 @@
 
 #include <config.h>
 #include <gst/gst.h>
-#include <libs/riff/gstriff.h>
+#include <gst/riff/riff.h>
 
 
 #ifdef __cplusplus