diff --git a/ChangeLog b/ChangeLog
index 9a23ebdd95..7fd48d72a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-08-16  Wim Taymans  <wim@fluendo.com>
+
+	* configure.ac:
+	* ext/amrnb/amrnbparse.c: (gst_amrnbparse_read_header):
+	Fix compile warning.
+
+	* ext/lame/gstlame.c: (gst_lame_class_init),
+	(gst_lame_src_getcaps), (gst_lame_src_setcaps),
+	(gst_lame_sink_setcaps), (gst_lame_init), (gst_lame_sink_event),
+	(gst_lame_chain), (gst_lame_change_state):
+	* ext/lame/gstlame.h:
+	Port lame plugin
+
 2005-08-16  Andy Wingo  <wingo@pobox.com>
 
 	* ext/raw1394/gstdv1394src.c (gst_dv1394src_iso_receive): Note
diff --git a/configure.ac b/configure.ac
index c65d54016d..45ce24f17f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -265,8 +265,7 @@ dnl =================================================
 # we set the defaults always to make sure we have non-empty variables
 # for the Makefile
 
-PKG_CHECK_MODULES(LIBOIL, liboil-0.2, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
-#PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.0, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
+PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.0, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
 AC_SUBST(LIBOIL_CFLAGS)
 AC_SUBST(LIBOIL_LIBS)
 if test "x${HAVE_LIBOIL}" = xyes ; then
@@ -411,6 +410,30 @@ return 0;
   AC_SUBST(FAAD_LIBS)
 ])
 
+dnl *** lame ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_LAME, true)
+GST_CHECK_FEATURE(LAME, [lame mp3 encoder library], lame, [
+  GST_CHECK_LIBHEADER(LAME, mp3lame, lame_init, -lm, lame/lame.h,
+  [
+    HAVE_LAME="yes"
+    LAME_LIBS="-lmp3lame -lm"
+    dnl is lame presets available
+    LAME_CFLAGS=""
+    AC_TRY_RUN([
+#include <lame/lame.h>
+int main (int argc, char *argv[])
+{
+  printf("%d\n", MEDIUM);
+  return 0;
+}
+      ],
+      [LAME_CFLAGS="-DGSTLAME_PRESET"],
+      [LAME_CFLAGS=""]
+    )
+  AC_SUBST(LAME_CFLAGS)
+  AC_SUBST(LAME_LIBS)
+  ])
+])
 
 dnl *** libcaca ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_LIBCACA, true)
@@ -629,6 +652,7 @@ ext/Makefile
 ext/aalib/Makefile
 ext/dv/Makefile
 ext/gconf/Makefile
+ext/lame/Makefile
 ext/libcaca/Makefile
 ext/libpng/Makefile
 ext/mad/Makefile