diff --git a/ChangeLog b/ChangeLog
index 76a1f9ce4d..b710f787a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2004-02-20  Andy Wingo  <wingo@pobox.com>
+
+	* gst/intfloat/, gst/oneton: Removed, replaced by audioconvert and
+	interleave respectively.
+
+	* gst/interleave/deinterleave.c: New plugin: deinterleave
+	(replaces on oneton).
+	* gst/interleave/interleave.c: New plugin: interleave.
+	* gst/interleave/plugin.h: Support file.
+	* gst/interleave/plugin.c: Support file.
+
+	* configure.ac: Remove intfloat and oneton, add interleave.
+
+	* ext/sndfile/gstsf.c: Handle events better.
+
+	* gst/audioconvert/gstaudioconvert.c: Change to support int2float
+	and float2int operation. int2float has scheduling problems as
+	noted in in2float_chain. 
+
 2004-02-20  Benjamin Otte  <otte@gnome.org>
 
 	* ext/xine/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 4631797a26..1616222654 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,7 +346,7 @@ GST_PLUGINS_ALL="\
 	flx \
 	goom \
 	id3 \
-	intfloat \
+	interleave \
 	law \
 	level \
 	matroska \
@@ -359,7 +359,6 @@ GST_PLUGINS_ALL="\
 	mpegaudioparse \
 	mpegstream \
 	monoscope \
-	oneton \
 	overlay \
 	passthrough \
 	playondemand \
@@ -1559,7 +1558,7 @@ gst/filter/Makefile
 gst/flx/Makefile
 gst/goom/Makefile
 gst/id3/Makefile
-gst/intfloat/Makefile
+gst/interleave/Makefile
 gst/law/Makefile
 gst/level/Makefile
 gst/matroska/Makefile
@@ -1574,7 +1573,6 @@ gst/mpegstream/Makefile
 gst/modplug/Makefile
 gst/modplug/libmodplug/Makefile
 gst/monoscope/Makefile
-gst/oneton/Makefile
 gst/overlay/Makefile
 gst/passthrough/Makefile
 gst/playondemand/Makefile
diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 403ab28185..580e1fff9c 100644
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -1227,4 +1227,3 @@ gst_mad_change_state (GstElement *element)
 
   return parent_class->change_state (element);
 }
-
diff --git a/gst/asfdemux/gstasfmux.c b/gst/asfdemux/gstasfmux.c
index da186c5537..2dca06ce87 100644
--- a/gst/asfdemux/gstasfmux.c
+++ b/gst/asfdemux/gstasfmux.c
@@ -1302,4 +1302,3 @@ gst_asfmux_change_state (GstElement *element)
 
   return GST_STATE_SUCCESS;
 }
-