diff --git a/ChangeLog b/ChangeLog
index 97f9a0d622..dbcffd64a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-03  Tim-Philipp Müller  <tim.muller at collabora co uk>
+
+	* configure.ac:
+	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_object):
+	  Use correct error code for encrypted streams.
+
 2008-07-02  Mark Nauwelaerts  <mark.nauwelaerts@collabora.co.uk>
 
 	* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_send_subbuffer),
diff --git a/configure.ac b/configure.ac
index bca9bc852d..bb1495c307 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,7 +47,7 @@ AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
 dnl *** required versions of GStreamer stuff ***
-GST_REQ=0.10.14
+GST_REQ=0.10.20
 GSTPB_REQ=0.10.14
 
 dnl *** autotools stuff ****
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 5b43aee677..d26c0a5de5 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -3107,8 +3107,7 @@ gst_asf_demux_process_object (GstASFDemux * demux, guint8 ** p_data,
 /* ERRORS */
 error_encrypted:
   {
-    GST_ELEMENT_ERROR (demux, STREAM, DEMUX,
-        (_("This file is encrypted and cannot be played.")), (NULL));
+    GST_ELEMENT_ERROR (demux, STREAM, DECRYPT, (NULL), (NULL));
     return GST_FLOW_ERROR;
   }
 }