diff --git a/ChangeLog b/ChangeLog
index 39e5c00713..11ea51989f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-29  Wim Taymans  <wim@fluendo.com>
+
+	* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_link_src):
+	Convert me to BaseTransform!! help..
+
 2005-07-29  Andy Wingo  <wingo@pobox.com>
 
 	* ext/alsa/gstalsaplugin.c (plugin_init): We are primary audio
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index a587ffc272..098e38ba6c 100644
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -431,6 +431,10 @@ gst_audio_convert_link_src (GstAudioConvert * this,
           "rate", G_TYPE_INT, sink_ac_caps->rate,
           "channels", G_TYPE_INT, sink_ac_caps->channels, NULL);
 
+      /* if there is a choice, prefer no conversion */
+      gst_caps_structure_fixate_field_nearest_int (structure,
+          "endianness", sink_ac_caps->endianness);
+
       if (strcmp (gst_structure_get_name (structure), "audio/x-raw-float") == 0) {
         if (!sink_ac_caps->is_int) {
           /* copy over */