diff --git a/ChangeLog b/ChangeLog
index 4691a5ba99..234e29386e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-23  Andy Wingo  <wingo@pobox.com>
+
+	* gst-libs/gst/audio/gstbaseaudiosrc.c
+	(gst_base_audio_src_fixate): Only fixate endianness if it is
+	present in the caps.
+
 2005-08-22  Andy Wingo  <wingo@pobox.com>
 
 	* ext/alsa/gstalsasink.c (gst_alsasink_get_property): 
diff --git a/gst-libs/gst/audio/gstbaseaudiosrc.c b/gst-libs/gst/audio/gstbaseaudiosrc.c
index a500ead742..7240742bb0 100644
--- a/gst-libs/gst/audio/gstbaseaudiosrc.c
+++ b/gst-libs/gst/audio/gstbaseaudiosrc.c
@@ -211,7 +211,8 @@ gst_base_audio_src_fixate (GstPad * pad, GstCaps * caps)
   gst_caps_structure_fixate_field_nearest_int (s, "depth", 16);
   gst_caps_structure_fixate_field_nearest_int (s, "width", 16);
   gst_structure_set (s, "signed", G_TYPE_BOOLEAN, TRUE, NULL);
-  gst_caps_structure_fixate_field_nearest_int (s, "endianness", G_BYTE_ORDER);
+  if (gst_structure_has_field (s, "endianness"))
+    gst_caps_structure_fixate_field_nearest_int (s, "endianness", G_BYTE_ORDER);
 }
 
 static gboolean