diff --git a/ChangeLog b/ChangeLog
index 91c4a62c9e..5580f32441 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-01-18  Jeremy Simon <jesimon@libertysurf.fr>
+
+	* configure.ac:
+	* ext/Makefile.am:
+	* ext/musicbrainz/gsttrm.c:
+	* ext/musicbrainz/gsttrm.h:
+	* ext/musicbrainz/Makefile.am:
+	Add a trm plugin 
+
 2004-01-18  Julien MOUTTE  <julien@moutte.net>
 
 	* sys/ximage/ximagesink.c: (gst_ximagesink_set_property),
diff --git a/configure.ac b/configure.ac
index af1fef40b2..230d708bdc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1195,6 +1195,15 @@ main (int   argc,
   fi
 ])
 
+dnl *** musicbrainz ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_MUSICBRAINZ, true)
+GST_CHECK_FEATURE(MUSICBRAINZ, [musicbrainz], musicbrainz, [
+  PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz,
+      HAVE_MUSICBRAINZ="yes", HAVE_MUSICBRAINZ="no")
+  AC_SUBST(MUSICBRAINZ_CFLAGS)
+  AC_SUBST(MUSICBRAINZ_LIBS)
+])
+
 dnl *** pango ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_PANGO, true)
 GST_CHECK_FEATURE(PANGO, [pango], pango, [
@@ -1634,6 +1643,7 @@ ext/mikmod/Makefile
 ext/mpeg2dec/Makefile
 ext/mpeg2enc/Makefile
 ext/mplex/Makefile
+ext/musicbrainz/Makefile
 ext/ogg/Makefile
 ext/pango/Makefile
 ext/raw1394/Makefile
diff --git a/ext/Makefile.am b/ext/Makefile.am
index 4c7eff84b6..daaf5b8c4c 100644
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -214,6 +214,12 @@ else
 MPLEX_DIR=
 endif
 
+if USE_MUSICBRAINZ
+MUSICBRAINZ_DIR=musicbrainz
+else
+MUSICBRAINZ_DIR=
+endif
+
 if USE_OGG
 OGG_DIR=ogg
 else
@@ -340,6 +346,7 @@ SUBDIRS=\
 	$(MPEG2DEC_DIR) \
 	$(MPEG2ENC_DIR) \
 	$(MPLEX_DIR) \
+	$(MUSICBRAINZ_DIR) \
 	$(OGG_DIR) \
 	$(PANGO_DIR) \
 	$(RAW1394_DIR) \
@@ -393,6 +400,7 @@ DIST_SUBDIRS=\
 	mpeg2dec \
 	mpeg2enc \
 	mplex \
+	muscibrainz \
 	ogg \
 	pango \
 	raw1394 \