diff --git a/ChangeLog b/ChangeLog
index 0996af18ac..eb385bfb12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2004-11-28  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* gst/audioconvert/Makefile.am:
+	* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_init),
+	(gst_audio_convert_link), (gst_audio_convert_change_state),
+	(gst_audio_convert_channels):
+	* gst/audioconvert/gstchannelmix.c:
+	(gst_audio_convert_unset_matrix),
+	(gst_audio_convert_fill_identical),
+	(gst_audio_convert_fill_compatible),
+	(gst_audio_convert_detect_pos), (gst_audio_convert_fill_one_other),
+	(gst_audio_convert_fill_others),
+	(gst_audio_convert_fill_normalize),
+	(gst_audio_convert_fill_matrix), (gst_audio_convert_setup_matrix),
+	(gst_audio_convert_passthrough), (gst_audio_convert_mix):
+	* gst/audioconvert/gstchannelmix.h:
+	  Implement a channel mixer.
+
 2004-11-28  Martin Soto  <martinsoto@users.sourceforge.net>
 
 	* ext/alsa/gstalsasink.c (gst_alsa_sink_loop):