diff --git a/ChangeLog b/ChangeLog
index 64ac54f399..203f68b628 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-12-01  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
+
+	* ext/esd/esdsink.c: (gst_esdsink_chain):
+	  Make error actually say something useful (fixes #156798).
+	* gst-libs/gst/riff/riff-media.c:
+	(gst_riff_create_video_caps_with_data),
+	(gst_riff_create_video_template_caps):
+	  Add Intel Video 5.0 fourcc (IV50).
+
 2004-12-01  Christophe Fergeau  <teuf@gnome.org>
 
 	* ext/mad/gstmad.c: (mpg123_parse_xing_header): fix xing header 
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index 73a3248753..796b3be6eb 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -316,8 +316,8 @@ gst_esdsink_chain (GstPad * pad, GstData * _data)
             goto done;
           }
           /* connection closed? */
-          GST_ELEMENT_ERROR (esdsink, RESOURCE, WRITE, (NULL),
-              ("communication with ESD failed"));
+          GST_ELEMENT_ERROR (esdsink, RESOURCE, WRITE,
+              ("Failed to write data to the esound daemon"), GST_ERROR_SYSTEM);
           return;
         }