diff --git a/ChangeLog b/ChangeLog
index e609c9e3a6..67a63d058f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-20  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* plugins/elements/gstfilesrc.c: (gst_file_src_map_region):
+	  Also, if mmap() fails that would be a READ error, not OPEN_READ.
+
 2008-02-20  Tim-Philipp Müller  <tim at centricular dot net>
 
 	* plugins/elements/Makefile.am:
@@ -69,7 +74,6 @@
 	  Copy selected buffer-flags when creating subbuffers.
 	  Fixes #516395.
 
->>>>>>> 1.3670
 2008-02-12  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	* gst/gstbuffer.c: (gst_buffer_class_init), (gst_buffer_finalize):
diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c
index 62be8aa643..814cf701bf 100644
--- a/plugins/elements/gstfilesrc.c
+++ b/plugins/elements/gstfilesrc.c
@@ -577,7 +577,7 @@ gst_file_src_map_region (GstFileSrc * src, off_t offset, size_t size,
 mmap_failed:
   {
     if (!testonly) {
-      GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL),
+      GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL),
           ("mmap (0x%08lx, %d, 0x%" G_GINT64_MODIFIER "x) failed: %s",
               (gulong) size, src->fd, (guint64) offset, g_strerror (errno)));
     }