diff --git a/Makefile.am b/Makefile.am
index 2aa23f37b1..ca0ef2779c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,14 +13,14 @@ GCONF_DIR =
 # endif
 
 SUBDIRS = 			\
-	gst sys ext		\
+	gst sys ext gst-libs	\
 	$(GCONF_DIR) 		\
 	m4 common		
 # disabled
 #	$(SUBDIRS_DOCS)
 
 DIST_SUBDIRS = 			\
-	gst sys ext		\
+	gst sys ext gst-libs	\
 	m4 common
 
 # disabled
diff --git a/configure.ac b/configure.ac
index f351af22ed..254f25050a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,6 @@ dnl AC_SUBST(GETTEXT_PACKAGE)
 dnl AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
 dnl                   [gettext package name])
 
-
 dnl decide on error flags
 AS_COMPILER_FLAG(-Wall, GST_WALL="yes", GST_WALL="no")
 
@@ -433,7 +432,8 @@ GST_CHECK_FEATURE(ESD, [esound plug-ins], esdsink, [
   ])
 ])
 
-GST_CFLAGS="$GST_CFLAGS $GST_ERROR"
+dnl also add builddir include for enumtypes and marshal
+GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS $GST_ERROR"
 
 AC_SUBST(GST_LIBS)
 AC_SUBST(GST_CFLAGS)
@@ -500,6 +500,8 @@ gst/smpte/Makefile
 gst/udp/Makefile
 gst/videobox/Makefile
 gst/videofilter/Makefile
+gst-libs/Makefile
+gst-libs/gst/Makefile
 sys/Makefile
 ext/Makefile
 ext/aalib/Makefile
diff --git a/gst-plugins.spec.in b/gst-plugins.spec.in
index 70b4561cff..50ac3217f8 100644
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -132,6 +132,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/gstreamer-%{majorminor}/libgstudp.so
 %{_libdir}/gstreamer-%{majorminor}/libgstalpha.so
 %{_libdir}/gstreamer-%{majorminor}/libgstgoom.so
+%{_libdir}/gstreamer-%{majorminor}/libgstrmdemux.so
+%{_libdir}/gstreamer-%{majorminor}/libgstavi.so
+%{_libdir}/gstreamer-%{majorminor}/libgstlevel.so
+%{_libdir}/gstreamer-%{majorminor}/libgstvideobox.so
 
 # gstreamer-plugins with external dependencies but in the main package
 # @USE_ARTS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstarts.so
@@ -215,8 +219,8 @@ Group:          Applications/Multimedia
 # @USE_FAAD_TRUE@BuildRequires:  faad2-devel >= 2.0
 # @USE_GSM_TRUE@BuildRequires:  gsm-devel >= 1.0.10
 # @USE_LAME_TRUE@BuildRequires:  lame-devel >= 3.89
-# @USE_MAD_TRUE@BuildRequires:  libid3tag-devel >= 0.15.0
-# @USE_MAD_TRUE@BuildRequires:  libmad-devel >= 0.15.0
+@USE_MAD_TRUE@BuildRequires:  libid3tag-devel >= 0.15.0
+@USE_MAD_TRUE@BuildRequires:  libmad-devel >= 0.15.0
                                                                                 
 Requires:       gstreamer09-plugins >= %{gstp_minver}
 Requires(pre):  %{_bindir}/gst-register-%{majorminor}
@@ -225,7 +229,7 @@ Requires(post): %{_bindir}/gst-register-%{majorminor}
 # @USE_FAAD_TRUE@Provides:      gstreamer-faad = %{version}-%{release}
 # @USE_GSM_TRUE@Provides:       gstreamer-gsm = %{version}-%{release}
 # @USE_LAME_TRUE@Provides:      gstreamer-lame = %{version}-%{release}
-# @USE_MAD_TRUE@Provides:       gstreamer-mad = %{version}-%{release}
+@USE_MAD_TRUE@Provides:       gstreamer-mad = %{version}-%{release}
                                                                                 
 %description extra-audio
 This package contains extra audio plugins for GStreamer, including
@@ -244,7 +248,7 @@ This package contains extra audio plugins for GStreamer, including
 # @USE_FAAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstfaad.so
 # @USE_GSM_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
 # @USE_LAME_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstlame.so
-# @USE_MAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmad.so
+@USE_MAD_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstmad.so
 
 %package extra-dvd
 Summary:        DVD plugins for GStreamer