diff --git a/ChangeLog b/ChangeLog
index ccf00c781e..21ee4e8ed5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-05-26  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* plugins/elements/gstelements.c:
+	* plugins/elements/gstfilesrc.c: (gst_file_src_class_init),
+	(gst_file_src_init), (gst_file_src_set_property),
+	(gst_file_src_get_property), (gst_file_src_start):
+	* plugins/elements/gstfilesrc.h:
+
+	Add a use-mmap property to enable easier testing of all code paths.
+	Bump rank to PRIMARY, so filesrc is the preferred file reader and used
+	in the absence of gnomevfssrc. (Closes #340501)
+
 2006-05-26  Zaheer Abbas Merali  <zaheerabbas at merali dot org>
 
 	* tools/gst-inspect.c:
diff --git a/plugins/elements/gstelements.c b/plugins/elements/gstelements.c
index b70aa9e2e5..942e4f2d83 100644
--- a/plugins/elements/gstelements.c
+++ b/plugins/elements/gstelements.c
@@ -57,7 +57,7 @@ static struct _elements_entry _elements[] = {
   {"fdsrc", GST_RANK_NONE, gst_fd_src_get_type},
   {"fdsink", GST_RANK_NONE, gst_fd_sink_get_type},
 #endif
-  {"filesrc", GST_RANK_NONE, gst_file_src_get_type},
+  {"filesrc", GST_RANK_PRIMARY, gst_file_src_get_type},
   {"identity", GST_RANK_NONE, gst_identity_get_type},
   {"queue", GST_RANK_NONE, gst_queue_get_type},
   {"filesink", GST_RANK_NONE, gst_file_sink_get_type},
diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c
index aa5f3e4c0d..b1a5aa53c9 100644
--- a/plugins/elements/gstfilesrc.c
+++ b/plugins/elements/gstfilesrc.c
@@ -132,6 +132,7 @@ enum
 #define DEFAULT_BLOCKSIZE       4*1024
 #define DEFAULT_MMAPSIZE        4*1024*1024
 #define DEFAULT_TOUCH           FALSE
+#define DEFAULT_USEMMAP         TRUE
 
 enum
 {
@@ -139,7 +140,8 @@ enum
   ARG_LOCATION,
   ARG_FD,
   ARG_MMAPSIZE,
-  ARG_TOUCH
+  ARG_TOUCH,
+  ARG_USEMMAP
 };
 
 static void gst_file_src_finalize (GObject * object);
@@ -214,8 +216,13 @@ gst_file_src_class_init (GstFileSrcClass * klass)
           "Size in bytes of mmap()d regions", 0, G_MAXULONG, DEFAULT_MMAPSIZE,
           G_PARAM_READWRITE));
   g_object_class_install_property (gobject_class, ARG_TOUCH,
-      g_param_spec_boolean ("touch", "Touch read data",
-          "Touch data to force disk read", DEFAULT_TOUCH, G_PARAM_READWRITE));
+      g_param_spec_boolean ("touch", "Touch mapped region read data",
+          "Touch mmapped data regions to force them to be read from disk",
+          DEFAULT_TOUCH, G_PARAM_READWRITE));
+  g_object_class_install_property (gobject_class, ARG_USEMMAP,
+      g_param_spec_boolean ("use-mmap", "Use mmap to read data",
+          "Whether to use mmap. FALSE to force normal read() calls",
+          DEFAULT_USEMMAP, G_PARAM_READWRITE));
 
   gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_file_src_finalize);
 
@@ -245,6 +252,7 @@ gst_file_src_init (GstFileSrc * src, GstFileSrcClass * g_class)
 
   src->mapbuf = NULL;
   src->mapsize = DEFAULT_MMAPSIZE;      /* default is 4MB */
+  src->use_mmap = DEFAULT_USEMMAP;
 
   src->is_regular = FALSE;
 }
@@ -329,6 +337,10 @@ gst_file_src_set_property (GObject * object, guint prop_id,
       src->touch = g_value_get_boolean (value);
       g_object_notify (G_OBJECT (src), "touch");
       break;
+    case ARG_USEMMAP:
+      src->use_mmap = g_value_get_boolean (value);
+      g_object_notify (G_OBJECT (src), "use-mmap");
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -358,6 +370,9 @@ gst_file_src_get_property (GObject * object, guint prop_id, GValue * value,
     case ARG_TOUCH:
       g_value_set_boolean (value, src->touch);
       break;
+    case ARG_USEMMAP:
+      g_value_set_boolean (value, src->use_mmap);
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -876,14 +891,17 @@ gst_file_src_start (GstBaseSrc * basesrc)
     src->is_regular = TRUE;
 
 #ifdef HAVE_MMAP
-  /* FIXME: maybe we should only try to mmap if it's a regular file */
-  /* allocate the first mmap'd region if it's a regular file ? */
-  src->mapbuf = gst_file_src_map_region (src, 0, src->mapsize, TRUE);
-  if (src->mapbuf != NULL) {
-    GST_DEBUG_OBJECT (src, "using mmap for file");
-    src->using_mmap = TRUE;
-    src->seekable = TRUE;
-  } else
+  if (src->use_mmap) {
+    /* FIXME: maybe we should only try to mmap if it's a regular file */
+    /* allocate the first mmap'd region if it's a regular file ? */
+    src->mapbuf = gst_file_src_map_region (src, 0, src->mapsize, TRUE);
+    if (src->mapbuf != NULL) {
+      GST_DEBUG_OBJECT (src, "using mmap for file");
+      src->using_mmap = TRUE;
+      src->seekable = TRUE;
+    }
+  }
+  if (src->mapbuf == NULL)
 #endif
   {
     /* If not in mmap mode, we need to check if the underlying file is
diff --git a/plugins/elements/gstfilesrc.h b/plugins/elements/gstfilesrc.h
index d17a765a7b..f5f5735754 100644
--- a/plugins/elements/gstfilesrc.h
+++ b/plugins/elements/gstfilesrc.h
@@ -68,6 +68,7 @@ struct _GstFileSrc {
                                            regular file */
   GstBuffer *mapbuf;
   size_t mapsize;
+  gboolean use_mmap;
 };
 
 struct _GstFileSrcClass {