diff --git a/data/dbus/tracker-miner-files-index.xml b/data/dbus/tracker-miner-files-index.xml
index afe3364..3adf562 100644
--- a/data/dbus/tracker-miner-files-index.xml
+++ b/data/dbus/tracker-miner-files-index.xml
@@ -10,5 +10,10 @@
       <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
       <arg type="s" name="file_uri" direction="in" />
     </method>
+    <method name="IndexMount">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
+      <arg type="s" name="mount_point_uri" direction="in" />
+    </method>
+
   </interface>
 </node>
diff --git a/src/libtracker-miner/tracker-miner-fs.c b/src/libtracker-miner/tracker-miner-fs.c
index e5fec2e..19d462c 100644
--- a/src/libtracker-miner/tracker-miner-fs.c
+++ b/src/libtracker-miner/tracker-miner-fs.c
@@ -24,6 +24,7 @@
 #include <libtracker-common/tracker-file-utils.h>
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-utils.h>
+#include <libtracker-common/tracker-ontologies.h>
 
 #include "tracker-crawler.h"
 #include "tracker-marshal.h"
@@ -36,6 +37,7 @@
 #include "tracker-task-pool.h"
 #include "tracker-sparql-buffer.h"
 #include "tracker-file-notifier.h"
+#include "tracker-storage.h"
 
 /* If defined will print the tree from GNode while running */
 #ifdef CRAWLED_TREE_ENABLE_TRACE
@@ -2890,6 +2892,126 @@ tracker_miner_fs_directory_add (TrackerMinerFS *fs,
 }
 
 static void
+set_up_mount_point_cb (GObject      *source,
+                       GAsyncResult *result,
+                       gpointer      user_data)
+{
+	TrackerSparqlConnection *connection = TRACKER_SPARQL_CONNECTION (source);
+	gchar *device_urn = user_data;
+	GError *error = NULL;
+
+	tracker_sparql_connection_update_finish (connection, result, &error);
+
+	if (error) {
+		g_critical ("Could not set mount point in database '%s', %s",
+		            device_urn,
+		            error->message);
+		printf ("Could not set mount point in database '%s', %s",
+		            device_urn,
+		            error->message);
+		g_error_free (error);
+	}
+
+	g_free (device_urn);
+}
+
+/**
+ * tracker_miner_fs_mount_add:
+ * @fs: a #TrackerMinerFS
+ * @file: #GMount for the directory to inspect
+ * @recurse: whether the directory should be inspected recursively
+ *
+ * Tells the filesystem miner to inspect a mount. This method intents
+ * to escape the strict duality dictated by the index-removable-devices
+ * and index-optical-discs gsettings keys.
+ *
+ * Since: 
+ **/
+void
+tracker_miner_fs_mount_add (TrackerMinerFS *fs,
+                            GMount         *mount)
+{
+	GFile *mount_point;
+	gchar *uri;
+	GString *queries;
+	TrackerStorage *storage;
+	gchar *iri;
+	gchar *uuid;
+	gchar *urn;
+	TrackerStorageType type;
+	
+	mount_point = g_mount_get_root (mount);
+	uri = g_file_get_uri (mount_point);
+
+	queries = g_string_new (NULL);
+	
+	storage = tracker_storage_new ();
+
+	/* Query the store for the URN of the mount point */
+	iri = tracker_miner_fs_query_urn (TRACKER_MINER_FS (fs), mount_point);
+
+	if (iri) {
+		/* if mount point exists in the store, nothing else to do */
+		g_message ("Mount point '%s' already exists in store: '%s'", uri, iri);
+
+		g_free (iri);
+	} else {
+		/* If it doesn't exist, we need to create it */
+		g_message ("Mount point '%s' does not exist in store, need to create it",
+					uri);
+		/* Create a nfo:Folder for the mount point */
+		g_string_append_printf (queries,
+                           "INSERT SILENT INTO <" TRACKER_MINER_FS_GRAPH_URN "> {"
+                           " _:file a nfo:FileDataObject, nie:InformationElement, nfo:Folder ; "
+                           "        nie:isStoredAs _:file ; "
+                           "        nie:url \"%s\" ; "
+                           "        nie:mimeType \"inode/directory\" ; "
+                           "        nfo:fileLastModified \"1981-06-05T02:20:00Z\" . "
+                           "}",
+                           uri);
+	
+	}
+
+	uuid = tracker_storage_get_uuid_for_file (storage, mount_point);	
+	urn = g_strconcat (TRACKER_DATASOURCE_URN_PREFIX, uuid, NULL);
+
+	type = tracker_storage_get_type_for_uuid (storage, uuid);
+
+	g_free (uuid);
+
+	g_string_append_printf (queries,
+                         "DELETE { <%s> a rdfs:Resource }  "
+                         "INSERT OR REPLACE { "
+                         "  <%s> a tracker:Volume; "
+                         "       tracker:mountPoint ?u ; "
+                         "		tracker:isRemovable %s ; "
+                         "		tracker:isOptical %s"
+                         "} WHERE { "
+                         "  ?u a nfo:FileDataObject; "
+                         "     nie:url \"%s\" "
+                         "} ",
+                         urn, urn, 
+                         TRACKER_STORAGE_TYPE_IS_REMOVABLE (type) ? "true" : "false",
+                         TRACKER_STORAGE_TYPE_IS_OPTICAL (type) ? "true" : "false",
+                         uri);
+	
+	g_free (uri);
+
+	tracker_sparql_connection_update_async (tracker_miner_get_connection (TRACKER_MINER (fs)),
+                                         queries->str,
+                                         G_PRIORITY_LOW,
+                                         NULL,
+                                         set_up_mount_point_cb,
+                                         g_strdup (urn));
+
+	g_string_free (queries, TRUE);
+
+	tracker_miner_fs_directory_add (fs, mount_point, TRUE);
+
+	g_object_unref (mount_point);
+}
+
+static void
 task_pool_cancel_foreach (gpointer data,
                           gpointer user_data)
 {
diff --git a/src/libtracker-miner/tracker-miner-fs.h b/src/libtracker-miner/tracker-miner-fs.h
index f4642a1..e06ae95 100644
--- a/src/libtracker-miner/tracker-miner-fs.h
+++ b/src/libtracker-miner/tracker-miner-fs.h
@@ -97,6 +97,8 @@ GType                 tracker_miner_fs_get_type             (void) G_GNUC_CONST;
 void                  tracker_miner_fs_directory_add        (TrackerMinerFS *fs,
                                                              GFile          *file,
                                                              gboolean        recurse);
+void                  tracker_miner_fs_mount_add            (TrackerMinerFS *fs,
+                                                             GMount         *mount);
 gboolean              tracker_miner_fs_directory_remove     (TrackerMinerFS *fs,
                                                              GFile          *file);
 gboolean              tracker_miner_fs_directory_remove_full (TrackerMinerFS *fs,
diff --git a/src/miners/fs/tracker-miner-files-index.c b/src/miners/fs/tracker-miner-files-index.c
index 26ae704..d588322 100644
--- a/src/miners/fs/tracker-miner-files-index.c
+++ b/src/miners/fs/tracker-miner-files-index.c
@@ -36,6 +36,9 @@ static const gchar introspection_xml[] =
   "    <method name='IndexFile'>"
   "      <arg type='s' name='file_uri' direction='in' />"
   "    </method>"
+  "    <method name='IndexMount'>"
+  "      <arg type='s' name='mount_point_uri' direction='in' />"
+  "    </method>"
   "  </interface>"
   "</node>";
 
@@ -54,6 +57,11 @@ typedef struct {
 } MimeTypesData;
 
 typedef struct {
+	TrackerMinerFS *miner;
+	GMount *mount;
+} IndexMountData;
+
+typedef struct {
 	TrackerMinerFiles *files_miner;
 	GDBusConnection *d_connection;
 	GDBusNodeInfo *introspection_data;
@@ -378,6 +386,94 @@ handle_method_call_index_file (TrackerMinerFilesIndex *miner,
 }
 
 static void
+application_appears (GDBusConnection *connection,
+                     const gchar     *name,
+                     const gchar     *name_owner,
+                     gpointer         user_data)
+{
+	IndexMountData *data = user_data;
+
+	tracker_miner_fs_mount_add (TRACKER_MINER_FS (data->miner), data->mount);
+}
+
+static void
+application_disappears (GDBusConnection *connection,
+                        const gchar     *name,
+                        const gchar     *name_owner,
+                        gpointer         user_data)
+{
+	IndexMountData *data = user_data;
+
+	tracker_miner_stop (data->miner);
+}
+
+static void
+handle_method_call_index_mount (TrackerMinerFilesIndex *miner,
+                                GDBusMethodInvocation  *invocation,
+                                GVariant               *parameters)
+{
+	TrackerMinerFilesIndexPrivate *priv;
+	TrackerDBusRequest *request;	
+	guint *watch_name_id;
+	const gchar *mount_point_uri;
+	const gchar *sender;
+	GFile *file;
+	GFileInfo *file_info;
+	GError *internal_error;
+	IndexMountData *data;
+
+	g_variant_get (parameters, "(&s)", &mount_point_uri);
+
+	tracker_gdbus_async_return_if_fail (mount_point_uri != NULL, invocation);
+
+	request = tracker_g_dbus_request_begin (invocation, "%s(uri:'%s')", __FUNCTION__, mount_point_uri);
+
+	file = g_file_new_for_uri (mount_point_uri);
+	file_info = g_file_query_info (file,
+	                               G_FILE_ATTRIBUTE_STANDARD_TYPE,
+	                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
+	                               NULL, NULL);
+
+	if (!file_info) {
+		internal_error = g_error_new_literal (1, 0, "File does not exist");
+		tracker_dbus_request_end (request, internal_error);
+		g_dbus_method_invocation_return_gerror (invocation, internal_error);
+
+		g_error_free (internal_error);
+
+		g_object_unref (file);
+
+		return;
+	}
+
+	g_object_unref (file_info);
+
+	data = g_slice_new0 (IndexMountData);
+	data->mount = g_object_ref (g_file_find_enclosing_mount (file, NULL, &internal_error));
+
+	priv = TRACKER_MINER_FILES_INDEX_GET_PRIVATE (miner);
+	data->miner = g_object_ref (TRACKER_MINER_FS (priv->files_miner));
+
+	if (data->mount) {
+		internal_error = g_error_new_literal (1, 0, "Mount does not exist");
+		tracker_dbus_request_end (request, internal_error);
+	}
+
+	sender = g_dbus_method_invocation_get_sender (invocation);
+	
+	watch_name_id = g_bus_watch_name (G_BUS_TYPE_SESSION,
+                                   sender,
+                                   G_BUS_NAME_WATCHER_FLAGS_NONE,
+                                   application_appears,
+                                   application_disappears,
+                                   data,
+                                   NULL);
+
+	tracker_dbus_request_end (request, NULL);
+	g_dbus_method_invocation_return_value (invocation, NULL);
+}
+
+static void
 handle_method_call (GDBusConnection       *connection,
                     const gchar           *sender,
                     const gchar           *object_path,
@@ -396,6 +492,8 @@ handle_method_call (GDBusConnection       *connection,
 		tracker_miner_files_index_reindex_mime_types (miner, invocation, parameters);
 	} else if (g_strcmp0 (method_name, "IndexFile") == 0) {
 		handle_method_call_index_file (miner, invocation, parameters);
+	} else if (g_strcmp0 (method_name, "IndexMount") == 0) {
+		handle_method_call_index_mount (miner, invocation, parameters);
 	} else {
 		g_assert_not_reached ();
 	}
