Merge branch 'data-in-binary-dirs'

176 files changed, 594 insertions, 768 deletions

diff --git a/Makefile.am b/Makefile.am
index 1498e6b84..5791a0811 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = data src docs po utils examples
+SUBDIRS = src docs po utils examples
 
 if HAVE_UNIT_TESTS
 SUBDIRS += tests
diff --git a/configure.ac b/configure.ac
index 8c8aec47b..4842875cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2556,22 +2556,6 @@ AM_CONDITIONAL(HAVE_ARTWORK, test "x$have_artwork" = "xyes")
 ##################################################################
 
 AC_CONFIG_FILES([
-	data/dbus/Makefile
-	data/gschemas/Makefile
-	data/icons/16x16/Makefile
-	data/icons/22x22/Makefile
-	data/icons/24x24/Makefile
-	data/icons/32x32/Makefile
-	data/icons/48x48/Makefile
-	data/icons/Makefile
-	data/icons/scalable/Makefile
-	data/languages/Makefile
-	data/Makefile
-	data/miners/Makefile
-	data/ontologies/Makefile
-	data/tracker-control.pc
-	data/tracker-sparql.pc
-	data/tracker-miner.pc
 	docs/Makefile
 	docs/design/Makefile
 	docs/manpages/Makefile
@@ -2589,21 +2573,26 @@ AC_CONFIG_FILES([
 	po/Makefile.in
 	src/gvdb/Makefile
 	src/libtracker-common/Makefile
+	src/libtracker-common/stop-words/Makefile
 	src/libtracker-sparql/Makefile
+	src/libtracker-sparql/tracker-sparql.pc
 	src/libtracker-bus/Makefile
 	src/libtracker-control/Makefile
+	src/libtracker-control/tracker-control.pc
 	src/libtracker-data/Makefile
 	src/libtracker-direct/Makefile
 	src/libtracker-sparql-backend/Makefile
 	src/libtracker-fts/Makefile
 	src/libtracker-extract/Makefile
 	src/libtracker-miner/Makefile
+	src/libtracker-miner/tracker-miner.pc
 	src/Makefile
 	src/miners/Makefile
 	src/miners/fs/Makefile
 	src/miners/apps/Makefile
 	src/miners/rss/Makefile
 	src/miners/user-guides/Makefile
+	src/ontologies/Makefile
 	src/tracker-store/Makefile
 	src/tracker-control/Makefile
 	src/tracker-extract/Makefile
@@ -2611,6 +2600,13 @@ AC_CONFIG_FILES([
 	src/tracker-preferences/tracker-preferences.desktop.in
 	src/tracker-needle/Makefile
 	src/tracker-needle/tracker-needle.desktop.in
+	src/tracker-needle/icons/Makefile
+	src/tracker-needle/icons/16x16/Makefile
+	src/tracker-needle/icons/22x22/Makefile
+	src/tracker-needle/icons/24x24/Makefile
+	src/tracker-needle/icons/32x32/Makefile
+	src/tracker-needle/icons/48x48/Makefile
+	src/tracker-needle/icons/scalable/Makefile
 	src/tracker-utils/Makefile
 	src/tracker-writeback/Makefile
 	src/plugins/Makefile
diff --git a/data/.gitignore b/data/.gitignore
deleted file mode 100644
index 6341442d1..000000000
--- a/data/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pc
-*.desktop.in
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index 055f214eb..000000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,101 +0,0 @@
-SUBDIRS = dbus languages icons ontologies miners gschemas
-
-# Set up pkg-config .pc files for exported libraries
-if HAVE_LIBMEDIAART
-requires="libmediaart-1.0"
-else
-requires=
-endif
-
-# First we fix the VERSION and libexecdir in the desktop files
-tracker-extract.desktop.in: tracker-extract.desktop.in.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|"      \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-tracker-store.desktop.in: tracker-store.desktop.in.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|"      \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-tracker-miner-fs.desktop.in: tracker-miner-fs.desktop.in.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|"      \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-tracker-miner-apps.desktop.in: tracker-miner-apps.desktop.in.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|"      \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-tracker-miner-rss.desktop.in: tracker-miner-rss.desktop.in.in
-	@$(SED) -e "s|@libexecdir[@]|${libexecdir}|"   \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-tracker-miner-user-guides.desktop.in: tracker-miner-user-guides.desktop.in.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|"      \
-	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
-
-desktop_in_in_files =                                  \
-	tracker-extract.desktop.in.in                  \
-	tracker-store.desktop.in.in                    \
-	tracker-miner-fs.desktop.in.in                 \
-	tracker-miner-apps.desktop.in.in               \
-	tracker-miner-user-guides.desktop.in.in        \
-	tracker-miner-rss.desktop.in.in
-
-# Second take those new .in files and translate them
-desktop_in_files =                                     \
-	tracker-extract.desktop.in                     \
-	tracker-store.desktop.in                       \
-	tracker-miner-fs.desktop.in                    \
-	tracker-miner-apps.desktop.in                  \
-	tracker-miner-user-guides.desktop.in           \
-	tracker-miner-rss.desktop.in
-
-# Third we choose what we want installed based on config
-autostartdir = $(sysconfdir)/xdg/autostart
-autostart_DATA =                                       \
-	tracker-store.desktop
-
-if HAVE_TRACKER_MINER_FS
-autostart_DATA += tracker-miner-fs.desktop
-endif
-
-if HAVE_TRACKER_EXTRACT
-autostart_DATA += tracker-extract.desktop
-endif
-
-if HAVE_TRACKER_MINER_APPS
-autostart_DATA += tracker-miner-apps.desktop
-endif
-
-if HAVE_TRACKER_MINER_RSS
-autostart_DATA += tracker-miner-rss.desktop
-endif
-
-if HAVE_TRACKER_MINER_USER_GUIDES
-autostart_DATA += tracker-miner-user-guides.desktop
-endif
-
-@INTLTOOL_DESKTOP_RULE@
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA =                                       \
-	tracker-control-$(TRACKER_API_VERSION).pc      \
-	tracker-sparql-$(TRACKER_API_VERSION).pc       \
-	tracker-miner-$(TRACKER_API_VERSION).pc
-
-tracker-control-$(TRACKER_API_VERSION).pc: tracker-control.pc
-	cp $< $@
-
-tracker-sparql-$(TRACKER_API_VERSION).pc: tracker-sparql.pc
-	cp $< $@
-
-tracker-miner-$(TRACKER_API_VERSION).pc: tracker-miner.pc
-	cp $< $@
-
-CLEANFILES =                                           \
-	$(autostart_DATA)                              \
-	$(desktop_in_files)                            \
-	tracker-control-$(TRACKER_API_VERSION).pc      \
-	tracker-sparql-$(TRACKER_API_VERSION).pc       \
-	tracker-miner-$(TRACKER_API_VERSION).pc
-
-EXTRA_DIST = $(desktop_in_in_files)
diff --git a/data/dbus/.gitignore b/data/dbus/.gitignore
deleted file mode 100644
index 0e3ad1b06..000000000
--- a/data/dbus/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.service
diff --git a/data/dbus/Makefile.am b/data/dbus/Makefile.am
deleted file mode 100644
index 402ce17e9..000000000
--- a/data/dbus/Makefile.am
+++ /dev/null
@@ -1,61 +0,0 @@
-configdir = $(datadir)/tracker
-
-config_DATA = \
-	tracker-backup.xml \
-	tracker-extract.xml \
-	tracker-extract-priority.xml \
-	tracker-miner.xml \
-	tracker-miner-web.xml \
-	tracker-resources.xml \
-	tracker-statistics.xml \
-	tracker-writeback.xml \
-	tracker-status.xml
-
-config_noinst = \
-	tracker-miner-files-index.xml
-
-# Services
-service_in_files = \
-	org.freedesktop.Tracker1.service.in \
-	org.freedesktop.Tracker1.Miner.Applications.service.in \
-	org.freedesktop.Tracker1.Miner.EMails.service.in \
-	org.freedesktop.Tracker1.Miner.Files.service.in \
-	org.freedesktop.Tracker1.Miner.Userguides.service.in \
-	org.freedesktop.Tracker1.Miner.RSS.service.in  \
-	org.freedesktop.Tracker1.Miner.Extract.service.in \
-	org.freedesktop.Tracker1.Writeback.service.in
-
-%.service: %.service.in
-	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
-
-# Services
-servicedir = $(DBUS_SERVICES_DIR)
-service_DATA = \
-	org.freedesktop.Tracker1.service \
-	org.freedesktop.Tracker1.Writeback.service
-
-if HAVE_TRACKER_MINER_FS
-service_DATA += \
-	org.freedesktop.Tracker1.Miner.Extract.service \
-	org.freedesktop.Tracker1.Miner.Files.service \
-	org.freedesktop.Tracker1.Miner.Applications.service
-endif
-
-if HAVE_TRACKER_MINER_EVOLUTION
-service_DATA += org.freedesktop.Tracker1.Miner.EMails.service
-endif
-
-if HAVE_TRACKER_MINER_RSS
-service_DATA += org.freedesktop.Tracker1.Miner.RSS.service
-endif
-
-if HAVE_TRACKER_MINER_USER_GUIDES
-service_DATA += org.freedesktop.Tracker1.Miner.Userguides.service
-endif
-
-EXTRA_DIST = \
-	$(service_in_files) \
-	$(config_DATA) \
-	$(config_noinst)
-
-CLEANFILES = $(service_DATA)
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Applications.service.in b/data/dbus/org.freedesktop.Tracker1.Miner.Applications.service.in
deleted file mode 100644
index ecd1fdac4..000000000
--- a/data/dbus/org.freedesktop.Tracker1.Miner.Applications.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Applications
-Exec=@libexecdir@/tracker-miner-apps
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.EMails.service.in b/data/dbus/org.freedesktop.Tracker1.Miner.EMails.service.in
deleted file mode 100644
index 3fadda59c..000000000
--- a/data/dbus/org.freedesktop.Tracker1.Miner.EMails.service.in
+++ /dev/null
@@ -1,2 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Emails
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Extract.service.in b/data/dbus/org.freedesktop.Tracker1.Miner.Extract.service.in
deleted file mode 100644
index 1df29c67c..000000000
--- a/data/dbus/org.freedesktop.Tracker1.Miner.Extract.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Extract
-Exec=@libexecdir@/tracker-extract
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Files.service.in b/data/dbus/org.freedesktop.Tracker1.Miner.Files.service.in
deleted file mode 100644
index 7563d49d0..000000000
--- a/data/dbus/org.freedesktop.Tracker1.Miner.Files.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Files
-Exec=@libexecdir@/tracker-miner-fs
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.RSS.service.in b/data/dbus/org.freedesktop.Tracker1.Miner.RSS.service.in
deleted file mode 100644
index 539e32e12..000000000
--- a/data/dbus/org.freedesktop.Tracker1.Miner.RSS.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.RSS
-Exec=@libexecdir@/tracker-miner-rss
diff --git a/data/dbus/org.freedesktop.Tracker1.Miner.Userguides.service.in b/data/dbus/org.freedesktop.Tracker1.Miner.Userguides.service.in
deleted file mode 100644
index fe7bf8efa..000000000
--- a/data/dbus/org.freedesktop.Tracker1.Miner.Userguides.service.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.freedesktop.Tracker1.Miner.Userguides
-Exec=@libexecdir@/tracker-miner-user-guides
diff --git a/data/dbus/tracker-miner-web.xml b/data/dbus/tracker-miner-web.xml
deleted file mode 100644
index 83bd1d41b..000000000
--- a/data/dbus/tracker-miner-web.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<node name="/">
-  <interface name="org.freedesktop.Tracker1.Miner.Web">
-    <method name="Authenticate">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Tries to authenticate the miner against the remote web service.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-    </method>
-    <method name="GetAssociationData">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Returns a hash containing the information necessary to know how to
-            associate the miner to its web service. Association is the action
-            of "binding" the miner and the web service, that is asking user
-            approval to be granted the right to access the data.
-            A miner must be associated before being able to download data.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-      <arg name="result" type="a{ss}" direction="out">
-        <doc:doc>
-          <doc:summary>
-            <doc:para>
-              A hash containing the association information. Its keys depend on
-              the type of association.
-              For a token based association, the following keys are always
-              defined:
-              * url: A url where the user can follow the association procedure.
-                     The page at this URL generally checks the user's
-                     credentials, and asks him to approve the service.
-                     When the user is done with the procedure, he has to notify
-                     the miner manager, which will then call the Associate
-                     method.
-              For a token based association, the following keys might be
-              defined:
-              * post_message: A message to display after he returns from the
-                              association procedure
-              * post_url: A url to point the user to after he returns from the
-                          association procedure
-              If both post_message and post_url are defined, the message will
-              shown to the user before he is pointer to post_url.
-              For a user/pass based based association, the hash table should be
-              empty, real association is done using the Associate method.
-            </doc:para>
-          </doc:summary>
-        </doc:doc>
-      </arg>
-    </method>
-    <method name="Associate">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Associates the miner with its web service using the provided
-            association data. After this step (if successful), the miner
-            should be able to access the online data.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-      <arg name="data" type="a{ss}" direction="in">
-        <doc:doc>
-          <doc:summary>
-            <doc:para>
-              A hash containing the association information. Its keys depend on
-              the type of association.
-              For a token based association, the hash should be empty. The miner
-              should get the definitive token from the remote web service, and
-              store it using the password provider.
-              For a user/pass based based association, the following keys
-              should be defined:
-              * username: The username provided by the user
-              * password: The password provided by the user
-              In the case of a user/pass association, the miner should use the
-              provided credentials to check the login against the remote web
-              service, and store them if successful.
-            </doc:para>
-          </doc:summary>
-        </doc:doc>
-      </arg>
-    </method>
-    <method name="Dissociate">
-      <annotation name="org.freedesktop.DBus.GLib.Async" value="true"/>
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Dissociates the miner from its web service. When called, the miner
-            should delete any credentials it has guarded using the password
-            provider, and if possible revoke the authorization from the remote
-            service.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-    </method>
-    <property name="Associated" type="b" access="read">
-      <doc:doc>
-        <doc:description>
-          <doc:para>
-            Holds the current association status of the miner. The possible values are
-            defined in tracker-miner-web.h.
-          </doc:para>
-        </doc:description>
-      </doc:doc>
-    </property>
-  </interface>
-</node>
diff --git a/data/gschemas/Makefile.am b/data/gschemas/Makefile.am
deleted file mode 100644
index 59d51aab9..000000000
--- a/data/gschemas/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
-gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
-
-base_schemas = \
-	org.freedesktop.Tracker.gschema.xml \
-	org.freedesktop.Tracker.DB.gschema.xml \
-	org.freedesktop.Tracker.FTS.gschema.xml \
-	org.freedesktop.Tracker.Store.gschema.xml \
-	org.freedesktop.Tracker.Extract.gschema.xml \
-	org.freedesktop.Tracker.Writeback.gschema.xml
-
-miner_fs_schema = org.freedesktop.Tracker.Miner.Files.gschema.xml
-
-all_schemas = $(base_schemas) $(miner_fs_schema)
-
-gsettings_SCHEMAS = $(base_schemas)
-
-if HAVE_TRACKER_MINER_FS
-gsettings_SCHEMAS += $(miner_fs_schema)
-endif
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
-@GSETTINGS_RULES@
-
-CLEANFILES = $(gsettings_SCHEMAS)
-
-EXTRA_DIST = \
-	$(all_schemas:.xml=.xml.in)
diff --git a/data/languages/Makefile.am b/data/languages/Makefile.am
deleted file mode 100644
index 3cbafc7e2..000000000
--- a/data/languages/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-configdir = $(datadir)/tracker/languages
-
-config_DATA =                                          \
-	stopwords.da                                   \
-	stopwords.de                                   \
-	stopwords.en                                   \
-	stopwords.es                                   \
-	stopwords.fi                                   \
-	stopwords.fr                                   \
-	stopwords.hu                                   \
-	stopwords.it                                   \
-	stopwords.nb                                   \
-	stopwords.nl                                   \
-	stopwords.pt                                   \
-	stopwords.ru                                   \
-	stopwords.sv
-
-EXTRA_DIST = $(config_DATA)
diff --git a/data/miners/.gitignore b/data/miners/.gitignore
deleted file mode 100644
index 7c8890b31..000000000
--- a/data/miners/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.desktop.in
diff --git a/data/miners/Makefile.am b/data/miners/Makefile.am
deleted file mode 100644
index 18835fb27..000000000
--- a/data/miners/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-desktop_in_in_files =                                  \
-	tracker-miner-extract.desktop.in.in            \
-	tracker-miner-userguides.desktop.in.in         \
-	tracker-miner-applications.desktop.in.in       \
-	tracker-miner-evolution.desktop.in.in          \
-	tracker-miner-files.desktop.in.in              \
-	tracker-miner-rss.desktop.in.in
-
-desktop_in_files =                                     \
-	tracker-miner-extract.desktop.in               \
-	tracker-miner-userguides.desktop.in            \
-	tracker-miner-applications.desktop.in          \
-	tracker-miner-evolution.desktop.in             \
-	tracker-miner-files.desktop.in                 \
-	tracker-miner-rss.desktop.in
-
-tracker_minersdir = $(datadir)/tracker/miners
-
-tracker_miners_DATA =
-
-if HAVE_TRACKER_MINER_FS
-tracker_miners_DATA +=                                 \
-	tracker-miner-extract.desktop                  \
-	tracker-miner-files.desktop
-endif
-
-if HAVE_TRACKER_MINER_APPS
-tracker_miners_DATA += tracker-miner-applications.desktop
-endif
-
-if HAVE_TRACKER_MINER_USER_GUIDES
-tracker_miners_DATA += tracker-miner-userguides.desktop
-endif
-
-if HAVE_TRACKER_MINER_EVOLUTION
-tracker_miners_DATA += tracker-miner-evolution.desktop
-endif
-
-if HAVE_TRACKER_MINER_RSS
-tracker_miners_DATA += tracker-miner-rss.desktop
-endif
-
-@INTLTOOL_DESKTOP_RULE@
-
-%.desktop.in: %.desktop.in.in
-	@sed -e "s|@datadir[@]|$(datadir)|" $< > $@
-
-EXTRA_DIST = $(desktop_in_in_files)
-CLEANFILES =                                           \
-	$(tracker_miners_DATA)                         \
-	$(desktop_in_files)
diff --git a/data/miners/tracker-miner-applications.desktop.in.in b/data/miners/tracker-miner-applications.desktop.in.in
deleted file mode 100644
index 7956ff43d..000000000
--- a/data/miners/tracker-miner-applications.desktop.in.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-_Name=Applications
-_Comment=Applications data miner
-Icon=system-installer
-DBusName=org.freedesktop.Tracker1.Miner.Applications
-DBusPath=/org/freedesktop/Tracker1/Miner/Applications
diff --git a/data/miners/tracker-miner-evolution.desktop.in.in b/data/miners/tracker-miner-evolution.desktop.in.in
deleted file mode 100644
index f860c5b35..000000000
--- a/data/miners/tracker-miner-evolution.desktop.in.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-_Name=Emails
-_Comment=Evolution Email miner
-DBusName=org.freedesktop.Tracker1.Miner.Emails
-DBusPath=/org/freedesktop/Tracker1/Miner/Emails
diff --git a/data/miners/tracker-miner-extract.desktop.in.in b/data/miners/tracker-miner-extract.desktop.in.in
deleted file mode 100644
index 1cf630284..000000000
--- a/data/miners/tracker-miner-extract.desktop.in.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-_Name=Extractor
-_Comment=Metadata extractor
-Icon=folder
-DBusName=org.freedesktop.Tracker1.Miner.Extract
-DBusPath=/org/freedesktop/Tracker1/Miner/Extract
diff --git a/data/miners/tracker-miner-files.desktop.in.in b/data/miners/tracker-miner-files.desktop.in.in
deleted file mode 100644
index bde06c20f..000000000
--- a/data/miners/tracker-miner-files.desktop.in.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-_Name=File System
-_Comment=File system data miner
-Icon=folder
-DBusName=org.freedesktop.Tracker1.Miner.Files
-DBusPath=/org/freedesktop/Tracker1/Miner/Files
diff --git a/data/miners/tracker-miner-rss.desktop.in.in b/data/miners/tracker-miner-rss.desktop.in.in
deleted file mode 100644
index 5147a7eea..000000000
--- a/data/miners/tracker-miner-rss.desktop.in.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[Desktop Entry]
-_Name=RSS/ATOM Feeds
-_Comment=Fetch RSS/ATOM Feeds
-DBusName=org.freedesktop.Tracker1.Miner.RSS
-DBusPath=/org/freedesktop/Tracker1/Miner/RSS
diff --git a/data/miners/tracker-miner-userguides.desktop.in.in b/data/miners/tracker-miner-userguides.desktop.in.in
deleted file mode 100644
index 16634bd60..000000000
--- a/data/miners/tracker-miner-userguides.desktop.in.in
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-_Name=Userguides
-_Comment=Userguide data miner
-Icon=system-installer
-DBusName=org.freedesktop.Tracker1.Miner.Userguides
-DBusPath=/org/freedesktop/Tracker1/Miner/Userguides
diff --git a/data/tracker-stop-words.txt b/data/tracker-stop-words.txt
deleted file mode 100644
index b586d00e7..000000000
--- a/data/tracker-stop-words.txt
+++ /dev/null
@@ -1,109 +0,0 @@
-a's able about above according
-accordingly across actually after afterwards
-again against ain't all allow
-allows almost alone along already
-also although always am among
-amongst an and
-anybody anyhow anyone anything anyway
-anyways anywhere apart appear appreciate
-appropriate are aren't around as
-aside ask asking associated at
-available away awfully be became
-because become becomes becoming been
-before beforehand behind being believe
-below beside besides best better
-between beyond both brief but
-by c'mon c's came can
-can't cannot cant cause causes
-certain certainly changes clearly co
-com come comes concerning consequently
-consider considering contain containing contains
-corresponding could couldn't course currently
-definitely described despite did didn't
-different do does doesn't doing
-don't done down downwards during
-each edu eg eight either
-else elsewhere enough entirely especially
-et etc even ever every
-everybody everyone everything everywhere ex
-exactly example except far few finally
-fifth first five followed following
-follows for former formerly forth
-four from further furthermore get
-gets getting given gives go
-goes going gone got gotten
-greetings had hadn't happens hardly
-has hasn't have haven't having
-he he's hello help hence
-her here here's hereafter hereby
-herein hereupon hers herself hi
-him himself his hither hopefully
-how howbeit however i'd i'll
-i'm i've ie if ignored
-immediate in inasmuch inc indeed
-indicate indicated indicates inner insofar
-instead int into inward is isn't
-it it'd it'll it's its
-itself just keep keeps kept
-know knows known last lately
-later latter latterly least less
-lest let let's like liked
-likely little look looking looks
-ltd mainly many may maybe
-me mean meanwhile merely might
-more moreover most mostly much
-must my myself name namely
-nd near nearly necessary need
-needs neither never nevertheless new
-next nine no nobody non
-none noone nor normally not
-nothing novel now nowhere obviously
-of off often oh ok
-okay old on once one
-ones only onto or
-others otherwise ought our ours
-ourselves out outside over overall
-own particular particularly per perhaps
-placed please plus possible presumably
-probably provides que quite qv
-rather rd re really reasonably
-regarding regardless regards relatively respectively
-right said same saw say
-saying says second secondly see
-seeing seem seemed seeming seems
-seen self selves sensible sent
-serious seriously seven several shall
-she should shouldn't since six
-so some somebody somehow someone
-something sometime sometimes somewhat somewhere
-soon sorry specified specify specifying
-still sub such sup sure
-t's take taken tell tends
-th than thank thanks thanx
-that that's thats the their
-theirs them themselves then thence
-there there's thereafter thereby therefore
-therein theres thereupon these they
-they'd they'll they're they've think
-third this thorough thoroughly those
-though three through throughout thru
-thus to together too took
-toward towards tried tries truly
-try trying twice two un
-under unfortunately unless unlikely until
-unto up upon us use
-used useful uses using usually
-value various very via viz
-vs want wants was wasn't
-way we we'd we'll we're
-we've welcome well went were
-weren't what what's whatever when
-whence whenever where where's whereafter
-whereas whereby wherein whereupon wherever
-whether which while whither who
-who's whoever whole whom whose
-why will willing wish with
-within without won't wonder would
-would wouldn't yes yet you
-you'd you'll you're you've your
-yours yourself yourselves zero
diff --git a/data/tracker.spec b/data/tracker.spec
deleted file mode 100644
index 46d354278..000000000
--- a/data/tracker.spec
+++ /dev/null
@@ -1,121 +0,0 @@
-Summary: An object database, tag/metadata database, search tool and indexer
-Name: tracker
-Version: 0.5.1
-Release: 1%{?dist}
-License: GPL
-Group: Applications/System
-URL: http://www.gnome.org/~jamiemcc/tracker/
-Source0: http://www.gnome.org/~jamiemcc/tracker/tracker-%{version}.tar.gz
-Source1: trackerd.desktop
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gmime-devel, poppler-devel, gettext
-BuildRequires: gnome-desktop-devel, gamin-devel
-BuildRequires: libexif-devel, libgsf-devel, gstreamer-devel
-BuildRequires: desktop-file-utils, intltool
-%if "%fedora" >= "6"
-BuildRequires: sqlite-devel
-%else
-BuildRequires: dbus-devel, dbus-glib
-%endif
-
-%description
-Tracker is a powerful desktop-neutral first class object database,
-tag/metadata database, search tool and indexer.
-
-It consists of a common object database that allows entities to have an
-almost infinte number of properties, metadata (both embedded/harvested as
-well as user definable), a comprehensive database of keywords/tags and
-links to other entities.
-
-It provides additional features for file based objects including context
-linking and audit trails for a file object.
-
-It has the ability to index, store, harvest metadata. retrieve and search
-all types of files and other first class objects
-
-%package devel
-Summary: Headers for developing programs that will use %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-
-%description devel
-This package contains the static libraries and header files needed for
-developing with tracker
-
-%prep
-%setup -q
-
-%build
-%if "%fedora" >= "6"
-%configure --disable-static --enable-external-sqlite
-%else
-%configure --disable-static
-%endif
-# make %{?_smp_mflags} fails
-make
-
-
-%install
-rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
-
-# Add an autostart for trackerd
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
-cp %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/
-
-rm -rf %{buildroot}%{_libdir}/*.la
-
-%clean
-rm -rf %{buildroot}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-, root, root, -)
-%doc AUTHORS ChangeLog COPYING NEWS README
-%{_bindir}/htmless
-%{_bindir}/o3totxt
-%{_bindir}/tracker*
-%{_datadir}/tracker/
-%{_datadir}/pixmaps/tracker/
-%{_datadir}/dbus-1/services/tracker.service
-%{_libdir}/*.so.*
-%{_mandir}/man1/tracker*.1.gz
-%{_sysconfdir}/xdg/autostart/trackerd.desktop
-
-%files devel
-%defattr(-, root, root, -)
-%{_includedir}/tracker*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*.pc
-
-%changelog
-* Mon Nov 06 2006 Deji Akingunola <dakingun@gmail.com> - 0.5.1-1
-- Update to new version
-
-* Mon Nov 06 2006 Deji Akingunola <dakingun@gmail.com> - 0.5.0-7
-- Have the devel subpackage require pkgconfig
-- Make the description field not have more than 76 characters on a line
-- Fix up the RPM group
-
-* Mon Nov 06 2006 Deji Akingunola <dakingun@gmail.com> - 0.5.0-6
-- Explicitly require dbus-devel and dbus-glib (needed for FC < 6)
-
-* Sun Nov 05 2006 Deji Akingunola <dakingun@gmail.com> - 0.5.0-5
-- Remove unneeded BRs (gnome-utils-devel and openssl-devel)
-
-* Sun Nov 05 2006 Deji Akingunola <dakingun@gmail.com> - 0.5.0-4
-- Add autostart desktop file.
-- Edit the package description as suggested in review
-
-* Sat Nov 04 2006 Deji Akingunola <dakingun@gmail.com> - 0.5.0-3
-- More cleaups to the spec file.
-
-* Sat Nov 04 2006 Deji Akingunola <dakingun@gmail.com> - 0.5.0-2
-- Add needed BRs
-
-* Sat Nov 04 2006 Deji Akingunola <dakingun@gmail.com> - 0.5.0-1
-- Initial packaging for Fedora Extras
diff --git a/docs/reference/ontology/Makefile.am b/docs/reference/ontology/Makefile.am
index 490373a9b..3a818e87d 100644
--- a/docs/reference/ontology/Makefile.am
+++ b/docs/reference/ontology/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.6
 
 # Generation of ontology.png using ontology-graph
 ontology.png:
-	$(top_builddir)/docs/tools/ontology-graph -d $(top_srcdir)/data/ontologies -o ontology.dot
+	$(top_builddir)/docs/tools/ontology-graph -d $(top_srcdir)/src/ontologies -o ontology.dot
 	$(AM_V_GEN) $(GRAPHVIZ_FDP) -Tpng -o $@ ontology.dot
 	rm ontology.dot
 
@@ -64,7 +64,7 @@ ONTOLOGY_INFOS_XML =                                   \
 
 # Generation of the ontology XML files.
 gen-doc.stamp: $(ONTOLOGY_EXPLANATIONS)
-	$(top_srcdir)/docs/tools/gen-doc.sh $(top_builddir)/docs/tools/ttl2sgml $(top_srcdir)/data/ontologies $(top_srcdir)/docs/ontologies .
+	$(top_srcdir)/docs/tools/gen-doc.sh $(top_builddir)/docs/tools/ttl2sgml $(top_srcdir)/src/ontologies $(top_srcdir)/docs/ontologies .
 	$(AM_V_GEN) touch $@
 
 # Make the final XML files depend on the stamp
diff --git a/docs/tools/gen-doc.sh b/docs/tools/gen-doc.sh
index 02291164c..3893a3707 100755
--- a/docs/tools/gen-doc.sh
+++ b/docs/tools/gen-doc.sh
@@ -50,7 +50,7 @@ echo "<?xml version='1.0' encoding='UTF-8'?>
 <tbody>" > $BUILD_DIR/fts-properties.xml
 
 for f in `find $ONTOLOGIES_DATA_DIR -name "*.description"` ; do
-    # ../../data/ontologies/XX-aaa.description -> PREFIX=aaa
+    # ../../src/ontologies/XX-aaa.description -> PREFIX=aaa
     TMPNAME=${f%.description}
     PREFIX=${TMPNAME#*-}
     echo "- Generating $PREFIX documentation"
diff --git a/docs/tools/generate-ontology.sh b/docs/tools/generate-ontology.sh
index 98c6f5820..5068dd9a0 100755
--- a/docs/tools/generate-ontology.sh
+++ b/docs/tools/generate-ontology.sh
@@ -18,6 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA. 
 
-./ontology-graph -d ../../data/ontologies -o ontology.dot
+./ontology-graph -d ../../src/ontologies -o ontology.dot
 fdp -Tpng -o ontology.png ontology.dot
 rm ontology.dot
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bfe03adbe..c755b64ea 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,38 +1,32 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 [encoding: UTF-8]
-data/gschemas/org.freedesktop.Tracker.DB.gschema.xml.in
-data/gschemas/org.freedesktop.Tracker.Extract.gschema.xml.in
-data/gschemas/org.freedesktop.Tracker.FTS.gschema.xml.in
-data/gschemas/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
-data/gschemas/org.freedesktop.Tracker.Store.gschema.xml.in
-data/gschemas/org.freedesktop.Tracker.Writeback.gschema.xml.in
-data/miners/tracker-miner-applications.desktop.in.in
-data/miners/tracker-miner-evolution.desktop.in.in
-data/miners/tracker-miner-extract.desktop.in.in
-data/miners/tracker-miner-files.desktop.in.in
-data/miners/tracker-miner-rss.desktop.in.in
-data/miners/tracker-miner-userguides.desktop.in.in
-data/tracker-extract.desktop.in.in
-data/tracker-miner-apps.desktop.in.in
-data/tracker-miner-fs.desktop.in.in
-data/tracker-miner-rss.desktop.in.in
-data/tracker-miner-user-guides.desktop.in.in
-data/tracker-store.desktop.in.in
 [type: gettext/glade]examples/rss-reader/rss_viewer.ui
 src/libtracker-common/tracker-dbus.c
 src/libtracker-common/tracker-utils.c
+src/libtracker-fts/org.freedesktop.Tracker.FTS.gschema.xml.in
+src/libtracker-data/org.freedesktop.Tracker.DB.gschema.xml.in
 src/libtracker-miner/tracker-enumerator.c
 src/libtracker-miner/tracker-data-provider.c
 src/libtracker-miner/tracker-miner-fs.c
 src/libtracker-miner/tracker-miner-object.c
 src/libtracker-miner/tracker-miner-online.c
+src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in
 src/miners/apps/tracker-main.c
+src/miners/apps/tracker-miner-apps.desktop.in.in
+src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
+src/miners/fs/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
 src/miners/fs/tracker-main.c
 src/miners/fs/tracker-miner-files.c
+src/miners/fs/tracker-miner-fs.desktop.in.in
+src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
 src/miners/rss/tracker-main.c
 src/miners/rss/tracker-miner-rss.c
+src/miners/rss/tracker-miner-rss.desktop.in.in
+src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in.in
 src/miners/user-guides/tracker-main.c
+src/miners/user-guides/tracker-miner-user-guides.desktop.in.in
+src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in.in
 src/plugins/evolution/org-freedesktop-Tracker-evolution-plugin.eplug.xml
 src/plugins/evolution/tracker-evolution-plugin.c
 src/plugins/nautilus/tracker-tags-extension.c
@@ -41,8 +35,11 @@ src/tracker-control/tracker-control.c
 src/tracker-control/tracker-control-general.c
 src/tracker-control/tracker-control-miners.c
 src/tracker-control/tracker-control-status.c
+src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
+src/tracker-extract/org.freedesktop.Tracker.Extract.gschema.xml.in
 src/tracker-extract/tracker-extract.c
 src/tracker-extract/tracker-main.c
+src/tracker-extract/tracker-extract.desktop.in.in
 src/tracker-needle/tracker-needle.desktop.in.in
 [type: gettext/glade]src/tracker-needle/tracker-needle.ui
 src/tracker-needle/tracker-needle.vala
@@ -55,6 +52,8 @@ src/tracker-preferences/tracker-preferences.desktop.in.in
 [type: gettext/glade]src/tracker-preferences/tracker-preferences.ui
 src/tracker-preferences/tracker-preferences.vala
 src/tracker-store/tracker-main.vala
+src/tracker-store/tracker-store.desktop.in.in
+src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml.in
 src/tracker-utils/tracker-import.c
 src/tracker-utils/tracker-info.c
 src/tracker-utils/tracker-search.c
@@ -62,5 +61,6 @@ src/tracker-utils/tracker-sparql.c
 src/tracker-utils/tracker-stats.c
 src/tracker-utils/tracker-tag.c
 src/tracker-writeback/tracker-main.c
+src/tracker-writeback/org.freedesktop.Tracker.Writeback.gschema.xml.in
 [type: gettext/glade]utils/gtk-sparql/gtk-sparql.ui
 utils/tracker-sql/tracker-sql.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 8dc1664a5..1cbb71eac 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,12 +1,5 @@
 # List of source files that should NOT be translated.
 # Please keep this file sorted alphabetically.
-data/tracker-extract.desktop.in
-data/tracker-miner-apps.desktop.in
-data/tracker-miner-fs.desktop.in
-data/tracker-miner-rss.desktop.in
-data/tracker-miner-user-guides.desktop.in
-data/tracker-status-icon.desktop.in
-data/tracker-store.desktop.in
 src/tracker-needle/tracker-needle.c
 src/tracker-needle/tracker-needle.desktop.in
 src/tracker-needle/tracker-query.c
@@ -19,3 +12,9 @@ src/tracker-preferences/tracker-preferences.desktop.in
 src/tracker-search-bar/GNOME_Search_Bar_Applet.server.in
 src/tracker-status-icon/tracker-status-icon.desktop.in
 src/tracker-store/tracker-main.c
+src/tracker-store/tracker-store.desktop.in
+src/tracker-extract/tracker-extract.desktop.in
+src/miners/user-guides/tracker-miner-user-guides.desktop.in
+src/miners/apps/tracker-miner-apps.desktop.in
+src/miners/fs/tracker-miner-fs.desktop.in
+src/miners/rss/tracker-miner-rss.desktop.in
diff --git a/src/Makefile.am b/src/Makefile.am
index ee76d8c2a..dcf8dd678 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ libtrackerfts_dir = libtracker-fts
 endif
 
 SUBDIRS =                                              \
+	ontologies				       \
 	gvdb                                           \
 	$(libstemmer_dir)                              \
 	libtracker-common                              \
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index fb7941d81..d2660a075 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = stop-words
+
 AM_CPPFLAGS = \
 	$(BUILD_CFLAGS) \
 	-I$(top_srcdir)/src \
diff --git a/src/libtracker-common/stop-words/Makefile.am b/src/libtracker-common/stop-words/Makefile.am
new file mode 100644
index 000000000..745df2362
--- /dev/null
+++ b/src/libtracker-common/stop-words/Makefile.am
@@ -0,0 +1,17 @@
+configdir = $(datadir)/tracker/stop-words
+config_DATA = \
+	stopwords.da \
+	stopwords.de \
+	stopwords.en \
+	stopwords.es \
+	stopwords.fi \
+	stopwords.fr \
+	stopwords.hu \
+	stopwords.it \
+	stopwords.nb \
+	stopwords.nl \
+	stopwords.pt \
+	stopwords.ru \
+	stopwords.sv
+
+EXTRA_DIST = $(config_DATA)
diff --git a/data/languages/stopwords.da b/src/libtracker-common/stop-words/stopwords.da
index e8522ef06..e8522ef06 100644
--- a/data/languages/stopwords.da
+++ b/src/libtracker-common/stop-words/stopwords.da
diff --git a/data/languages/stopwords.de b/src/libtracker-common/stop-words/stopwords.de
index 8464fccb8..8464fccb8 100644
--- a/data/languages/stopwords.de
+++ b/src/libtracker-common/stop-words/stopwords.de
diff --git a/data/languages/stopwords.en b/src/libtracker-common/stop-words/stopwords.en
index 83be25a1d..83be25a1d 100644
--- a/data/languages/stopwords.en
+++ b/src/libtracker-common/stop-words/stopwords.en
diff --git a/data/languages/stopwords.es b/src/libtracker-common/stop-words/stopwords.es
index 90a366aee..90a366aee 100644
--- a/data/languages/stopwords.es
+++ b/src/libtracker-common/stop-words/stopwords.es
diff --git a/data/languages/stopwords.fi b/src/libtracker-common/stop-words/stopwords.fi
index 3b468b32c..3b468b32c 100644
--- a/data/languages/stopwords.fi
+++ b/src/libtracker-common/stop-words/stopwords.fi
diff --git a/data/languages/stopwords.fr b/src/libtracker-common/stop-words/stopwords.fr
index a02063baf..a02063baf 100644
--- a/data/languages/stopwords.fr
+++ b/src/libtracker-common/stop-words/stopwords.fr
diff --git a/data/languages/stopwords.hu b/src/libtracker-common/stop-words/stopwords.hu
index 694feb102..694feb102 100644
--- a/data/languages/stopwords.hu
+++ b/src/libtracker-common/stop-words/stopwords.hu
diff --git a/data/languages/stopwords.it b/src/libtracker-common/stop-words/stopwords.it
index 992b33510..992b33510 100644
--- a/data/languages/stopwords.it
+++ b/src/libtracker-common/stop-words/stopwords.it
diff --git a/data/languages/stopwords.nb b/src/libtracker-common/stop-words/stopwords.nb
index bb9edb15e..bb9edb15e 100644
--- a/data/languages/stopwords.nb
+++ b/src/libtracker-common/stop-words/stopwords.nb
diff --git a/data/languages/stopwords.nl b/src/libtracker-common/stop-words/stopwords.nl
index 300c36833..300c36833 100644
--- a/data/languages/stopwords.nl
+++ b/src/libtracker-common/stop-words/stopwords.nl
diff --git a/data/languages/stopwords.pt b/src/libtracker-common/stop-words/stopwords.pt
index 66d557f9c..66d557f9c 100644
--- a/data/languages/stopwords.pt
+++ b/src/libtracker-common/stop-words/stopwords.pt
diff --git a/data/languages/stopwords.ru b/src/libtracker-common/stop-words/stopwords.ru
index dc820c0e9..dc820c0e9 100644
--- a/data/languages/stopwords.ru
+++ b/src/libtracker-common/stop-words/stopwords.ru
diff --git a/data/languages/stopwords.sv b/src/libtracker-common/stop-words/stopwords.sv
index 0f303130e..0f303130e 100644
--- a/data/languages/stopwords.sv
+++ b/src/libtracker-common/stop-words/stopwords.sv
diff --git a/src/libtracker-common/tracker-language.c b/src/libtracker-common/tracker-language.c
index 73096b234..cb8d717e9 100644
--- a/src/libtracker-common/tracker-language.c
+++ b/src/libtracker-common/tracker-language.c
@@ -235,7 +235,7 @@ language_get_stopword_filename (const gchar *language_code)
 	if (!testpath) {
 		filename = g_build_filename (SHAREDIR,
 		                             "tracker",
-		                             "languages",
+		                             "stop-words",
 		                             str,
 		                             NULL);
 	} else {
diff --git a/src/libtracker-control/.gitignore b/src/libtracker-control/.gitignore
index 00197d028..4f98f606f 100644
--- a/src/libtracker-control/.gitignore
+++ b/src/libtracker-control/.gitignore
@@ -1,2 +1,3 @@
 tracker-control-*.deps
 tracker-control-*.vapi
+*.pc
diff --git a/src/libtracker-control/Makefile.am b/src/libtracker-control/Makefile.am
index 20c11794a..be6eb158e 100644
--- a/src/libtracker-control/Makefile.am
+++ b/src/libtracker-control/Makefile.am
@@ -34,6 +34,15 @@ libtracker_control_@TRACKER_API_VERSION@_la_LIBADD =     \
 	$(BUILD_LIBS)                                    \
 	$(LIBTRACKER_MINER_LIBS)
 
+# PkgConfig
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = tracker-control-$(TRACKER_API_VERSION).pc
+
+tracker-control-$(TRACKER_API_VERSION).pc: tracker-control.pc
+	cp $< $@
+
+CLEANFILES = tracker-control-$(TRACKER_API_VERSION).pc
+
 # Vala bindings
 vapidir = $(datadir)/vala/vapi
 vapi_DATA =                                              \
@@ -49,7 +58,7 @@ tracker-control-$(TRACKER_API_VERSION).deps: tracker-control.deps
 BUILT_SOURCES =                                        \
 	$(vapi_DATA)
 
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES += $(BUILT_SOURCES)
 
 EXTRA_DIST =                                           \
 	tracker-control.vapi                           \
diff --git a/data/tracker-control.pc.in b/src/libtracker-control/tracker-control.pc.in
index cb7529c03..cb7529c03 100644
--- a/data/tracker-control.pc.in
+++ b/src/libtracker-control/tracker-control.pc.in
diff --git a/src/libtracker-control/tracker-miner-manager.c b/src/libtracker-control/tracker-miner-manager.c
index 0a7c4ea88..cf05bb613 100644
--- a/src/libtracker-control/tracker-miner-manager.c
+++ b/src/libtracker-control/tracker-miner-manager.c
@@ -40,10 +40,10 @@
 
 #define TRACKER_MINER_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_MINER_MANAGER, TrackerMinerManagerPrivate))
 
-#define DESKTOP_ENTRY_GROUP "Desktop Entry"
-#define DBUS_NAME_KEY "DBusName"
-#define DBUS_PATH_KEY "DBusPath"
-#define DISPLAY_NAME_KEY "Name"
+#define DESKTOP_ENTRY_GROUP "D-BUS Service"
+#define DBUS_NAME_KEY "Name"
+#define DBUS_PATH_KEY "Path"
+#define DISPLAY_NAME_KEY "DisplayName"
 #define DESCRIPTION_KEY "Comment"
 
 typedef struct TrackerMinerManagerPrivate TrackerMinerManagerPrivate;
@@ -759,9 +759,9 @@ check_file (GFile    *file,
 
 	data = g_slice_new0 (MinerData);
 	data->dbus_path = dbus_path;
-	data->dbus_name = dbus_name;
+	data->dbus_name = dbus_name;        /* In .service file as Name */
 	data->display_name = display_name;
-	data->description = description;
+	data->description = description;    /* In .desktop file as _comment */
 
 	priv->miners = g_list_prepend (priv->miners, data);
 
@@ -829,7 +829,7 @@ initialize_miners_data (TrackerMinerManager *manager)
 	}
 
 	file = g_file_new_for_path (miners_dir);
-	directory_foreach (file, ".desktop", (GFunc) check_file, manager);
+	directory_foreach (file, ".service", (GFunc) check_file, manager);
 	g_object_unref (file);
 }
 
diff --git a/src/libtracker-data/.gitignore b/src/libtracker-data/.gitignore
index 26dc72917..79d98d419 100644
--- a/src/libtracker-data/.gitignore
+++ b/src/libtracker-data/.gitignore
@@ -4,3 +4,5 @@ tracker-sparql-query.[ch]
 tracker-sparql-query.vapi
 tracker-sparql-scanner.c
 tracker-turtle-reader.c
+*.xml
+*.valid
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index 2a5445438..e25b76691 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -74,8 +74,21 @@ noinst_HEADERS =                                       \
 	tracker-property.h                             \
 	tracker-sparql-query.h
 
-BUILT_SOURCES =                                        \
-	libtracker_data_la_vala.stamp
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
 
-EXTRA_DIST =                                           \
-	libtracker-data.vapi
+gsettings_SCHEMAS = org.freedesktop.Tracker.DB.gschema.xml
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+CLEANFILES = \
+	libtracker_data_la_vala.stamp \
+	$(gsettings_SCHEMAS)
+
+EXTRA_DIST = \
+	libtracker-data.vapi \
+	$(gsettings_SCHEMAS:.xml=.xml.in)
diff --git a/data/gschemas/org.freedesktop.Tracker.DB.gschema.xml.in b/src/libtracker-data/org.freedesktop.Tracker.DB.gschema.xml.in
index dc15e89c5..dc15e89c5 100644
--- a/data/gschemas/org.freedesktop.Tracker.DB.gschema.xml.in
+++ b/src/libtracker-data/org.freedesktop.Tracker.DB.gschema.xml.in
diff --git a/data/gschemas/.gitignore b/src/libtracker-fts/.gitignore
index c29f42faa..c29f42faa 100644
--- a/data/gschemas/.gitignore
+++ b/src/libtracker-fts/.gitignore
diff --git a/src/libtracker-fts/Makefile.am b/src/libtracker-fts/Makefile.am
index f5a23a3a8..322365ecf 100644
--- a/src/libtracker-fts/Makefile.am
+++ b/src/libtracker-fts/Makefile.am
@@ -54,3 +54,17 @@ libtracker_fts_la_LIBADD =                             \
 	$(LIBTRACKER_FTS_LIBS)
 
 EXTRA_DIST = $(fts4_sources)
+
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+
+gsettings_SCHEMAS = org.freedesktop.Tracker.FTS.gschema.xml
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+CLEANFILES = $(gsettings_SCHEMAS)
+EXTRA_DIST += $(gsettings_SCHEMAS:.xml=.xml.in)
diff --git a/data/gschemas/org.freedesktop.Tracker.FTS.gschema.xml.in b/src/libtracker-fts/org.freedesktop.Tracker.FTS.gschema.xml.in
index b487aed50..b487aed50 100644
--- a/data/gschemas/org.freedesktop.Tracker.FTS.gschema.xml.in
+++ b/src/libtracker-fts/org.freedesktop.Tracker.FTS.gschema.xml.in
diff --git a/src/libtracker-miner/.gitignore b/src/libtracker-miner/.gitignore
index 4451b56f1..4664a2c8c 100644
--- a/src/libtracker-miner/.gitignore
+++ b/src/libtracker-miner/.gitignore
@@ -3,3 +3,4 @@ tracker-miner-*.vapi
 tracker-miner-web-full.xml
 tracker-miner-enum-types.c
 tracker-miner-enum-types.h
+*.pc
diff --git a/src/libtracker-miner/Makefile.am b/src/libtracker-miner/Makefile.am
index 3fc81d1a3..d9c7c8d66 100644
--- a/src/libtracker-miner/Makefile.am
+++ b/src/libtracker-miner/Makefile.am
@@ -118,6 +118,15 @@ libtracker_miner_@TRACKER_API_VERSION@_la_LIBADD =     \
 	$(BUILD_LIBS)                                  \
 	$(LIBTRACKER_MINER_LIBS)
 
+# PkgConfig
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = tracker-miner-$(TRACKER_API_VERSION).pc
+
+tracker-miner-$(TRACKER_API_VERSION).pc: tracker-miner.pc
+	cp $< $@
+
+CLEANFILES = tracker-miner-$(TRACKER_API_VERSION).pc
+
 # Vala bindings
 vapidir = $(datadir)/vala/vapi
 vapi_DATA =                                            \
@@ -135,7 +144,7 @@ BUILT_SOURCES =                                        \
 	tracker-miner-enum-types.h                     \
 	$(vapi_DATA)
 
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES += $(BUILT_SOURCES)
 
 EXTRA_DIST =                                           \
 	tracker-miner-enum-types.c.template            \
@@ -187,3 +196,9 @@ build-vapi: TrackerMiner-$(TRACKER_API_VERSION).gir
 	@vapigen --library tracker-miner --metadatadir $(top_srcdir) --pkg gio-2.0 --vapidir $(top_builddir)/src/libtracker-sparql --pkg tracker-sparql-$(TRACKER_API_VERSION) TrackerMiner-$(TRACKER_API_VERSION).gir
 
 endif
+
+# DBus interfaces (XML files)
+configdir = $(datadir)/tracker
+config_DATA = tracker-miner.xml
+
+EXTRA_DIST += $(config_DATA)
diff --git a/data/tracker-miner.pc.in b/src/libtracker-miner/tracker-miner.pc.in
index 386ba72ef..386ba72ef 100644
--- a/data/tracker-miner.pc.in
+++ b/src/libtracker-miner/tracker-miner.pc.in
diff --git a/data/dbus/tracker-miner.xml b/src/libtracker-miner/tracker-miner.xml
index 6256c12d4..6256c12d4 100644
--- a/data/dbus/tracker-miner.xml
+++ b/src/libtracker-miner/tracker-miner.xml
diff --git a/src/libtracker-sparql/.gitignore b/src/libtracker-sparql/.gitignore
index 1adeb1afc..04a1732c3 100644
--- a/src/libtracker-sparql/.gitignore
+++ b/src/libtracker-sparql/.gitignore
@@ -8,3 +8,4 @@ tracker-sparql-*.deps
 tracker-sparql*.vapi
 tracker-generated*.h
 tracker-utils.c
+*.pc
diff --git a/src/libtracker-sparql/Makefile.am b/src/libtracker-sparql/Makefile.am
index 4ff547638..194730277 100644
--- a/src/libtracker-sparql/Makefile.am
+++ b/src/libtracker-sparql/Makefile.am
@@ -51,6 +51,15 @@ libtracker_sparqlinclude_HEADERS =                     \
 tracker-sparql-$(TRACKER_API_VERSION).deps: tracker-sparql.deps
 	$(AM_V_GEN)cp $^ $@
 
+# PkgConfig
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = tracker-sparql-$(TRACKER_API_VERSION).pc
+
+tracker-sparql-$(TRACKER_API_VERSION).pc: tracker-sparql.pc
+	cp $< $@
+
+CLEANFILES = tracker-sparql-$(TRACKER_API_VERSION).pc
+
 # Vala bindings
 vapidir = $(datadir)/vala/vapi
 vapi_DATA =                                            \
@@ -65,8 +74,7 @@ MAINTAINERCLEANFILES =                                 \
 	tracker-sparql-$(TRACKER_API_VERSION).deps     \
 	$(vala_header:.h=-no-checks.h)
 
-CLEANFILES =                                           \
-	tracker-sparql-$(TRACKER_API_VERSION).vapi
+CLEANFILES += tracker-sparql-$(TRACKER_API_VERSION).vapi
 
 EXTRA_DIST =                                           \
 	tracker-sparql-$(TRACKER_API_VERSION).deps     \
diff --git a/data/tracker-sparql.pc.in b/src/libtracker-sparql/tracker-sparql.pc.in
index 4fb785c3d..4fb785c3d 100644
--- a/data/tracker-sparql.pc.in
+++ b/src/libtracker-sparql/tracker-sparql.pc.in
diff --git a/src/miners/apps/.gitignore b/src/miners/apps/.gitignore
index ecce41d91..2d014f80d 100644
--- a/src/miners/apps/.gitignore
+++ b/src/miners/apps/.gitignore
@@ -1 +1,2 @@
 tracker-miner-apps
+*.service
diff --git a/src/miners/apps/Makefile.am b/src/miners/apps/Makefile.am
index c17b44709..9e450b794 100644
--- a/src/miners/apps/Makefile.am
+++ b/src/miners/apps/Makefile.am
@@ -20,3 +20,42 @@ tracker_miner_apps_LDADD =                             \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_APPS_LIBS)
+
+# DBus interfaces (XML files) and services
+%.service.in: %.service.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Applications.service
+
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
+	$(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+	           "$(DESTDIR)$(servicedir)/$(service_DATA)"
+
+uninstall-local:
+	$(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+
+# Desktop files: First we fix the VERSION and libexecdir
+%.desktop.in: %.desktop.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
+	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
+
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_DATA = tracker-miner-apps.desktop
+
+@INTLTOOL_DESKTOP_RULE@
+
+# Dist / Clean rules for all data
+CLEANFILES = \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA) \
+	$(service_DATA:.service=.service.in)
+
+EXTRA_DIST = \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(service_DATA:.service=.service.in.in)
diff --git a/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in b/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in
new file mode 100644
index 000000000..100fb778c
--- /dev/null
+++ b/src/miners/apps/org.freedesktop.Tracker1.Miner.Applications.service.in.in
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Applications
+Exec=@libexecdir@/tracker-miner-apps
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Applications
+_DisplayName=Applications
+_Comment=Applications data miner
diff --git a/data/tracker-miner-apps.desktop.in.in b/src/miners/apps/tracker-miner-apps.desktop.in.in
index 0c49814b1..0c49814b1 100644
--- a/data/tracker-miner-apps.desktop.in.in
+++ b/src/miners/apps/tracker-miner-apps.desktop.in.in
diff --git a/src/miners/fs/.gitignore b/src/miners/fs/.gitignore
index 175a9f542..b554dc2bc 100644
--- a/src/miners/fs/.gitignore
+++ b/src/miners/fs/.gitignore
@@ -1 +1,4 @@
 tracker-miner-fs
+*.service
+*.xml
+*.valid
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index fbb222cc3..ef3a30387 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -49,3 +49,65 @@ tracker_miner_fs_LDADD =                               \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_FS_LIBS)
+
+# DBus interfaces (XML files) and services
+configdir = $(datadir)/tracker
+config_DATA = tracker-miner-files-index.xml
+
+%.service.in: %.service.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Files.service
+
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
+	$(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+	           "$(DESTDIR)$(servicedir)/$(service_DATA)"
+
+uninstall-local:
+	$(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+
+# Desktop files: First we fix the VERSION and libexecdir
+if HAVE_LIBMEDIAART
+requires="libmediaart-1.0"
+else
+requires=
+endif
+
+%.desktop.in: %.desktop.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
+	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
+
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_DATA = tracker-miner-fs.desktop
+
+@INTLTOOL_DESKTOP_RULE@
+
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+
+gsettings_SCHEMAS = org.freedesktop.Tracker.Miner.Files.gschema.xml
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+CLEANFILES = \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA) \
+	$(service_DATA:.service=.service.in) \
+	$(gsettings_SCHEMAS)
+
+EXTRA_DIST = \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(config_DATA) \
+	$(service_DATA:.service=.service.in.in) \
+	$(gsettings_SCHEMAS:.xml=.xml.in)
+
diff --git a/data/gschemas/org.freedesktop.Tracker.Miner.Files.gschema.xml.in b/src/miners/fs/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
index b40a1904e..b40a1904e 100644
--- a/data/gschemas/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
+++ b/src/miners/fs/org.freedesktop.Tracker.Miner.Files.gschema.xml.in
diff --git a/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
new file mode 100644
index 000000000..1a285d93f
--- /dev/null
+++ b/src/miners/fs/org.freedesktop.Tracker1.Miner.Files.service.in.in
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Files
+Exec=@libexecdir@/tracker-miner-fs
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Files
+_DisplayName=File System
+_Comment=File system data miner
diff --git a/data/dbus/tracker-miner-files-index.xml b/src/miners/fs/tracker-miner-files-index.xml
index afe336401..afe336401 100644
--- a/data/dbus/tracker-miner-files-index.xml
+++ b/src/miners/fs/tracker-miner-files-index.xml
diff --git a/data/tracker-miner-fs.desktop.in.in b/src/miners/fs/tracker-miner-fs.desktop.in.in
index a1620f6ba..a1620f6ba 100644
--- a/data/tracker-miner-fs.desktop.in.in
+++ b/src/miners/fs/tracker-miner-fs.desktop.in.in
diff --git a/src/miners/rss/.gitignore b/src/miners/rss/.gitignore
index 2cf77a727..62c2dec7e 100644
--- a/src/miners/rss/.gitignore
+++ b/src/miners/rss/.gitignore
@@ -1 +1,2 @@
 tracker-miner-rss
+*.service
diff --git a/src/miners/rss/Makefile.am b/src/miners/rss/Makefile.am
index 8340cefb4..6385c0e63 100644
--- a/src/miners/rss/Makefile.am
+++ b/src/miners/rss/Makefile.am
@@ -20,3 +20,42 @@ tracker_miner_rss_LDADD =                              \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_RSS_LIBS)
+
+# DBus interfaces (XML files) and services
+%.service.in: %.service.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.RSS.service
+
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
+	$(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+	           "$(DESTDIR)$(servicedir)/$(service_DATA)"
+
+uninstall-local:
+	$(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+
+# Desktop files: First we fix the VERSION and libexecdir
+%.desktop.in: %.desktop.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
+	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
+
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_DATA = tracker-miner-rss.desktop
+
+@INTLTOOL_DESKTOP_RULE@
+
+# Dist / Clean rules for all data
+CLEANFILES = \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA) \
+	$(service_DATA:.service=.service.in)
+
+EXTRA_DIST = \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(service_DATA:.service=.service.in.in)
diff --git a/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
new file mode 100644
index 000000000..860d2c66d
--- /dev/null
+++ b/src/miners/rss/org.freedesktop.Tracker1.Miner.RSS.service.in.in
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.RSS
+Exec=@libexecdir@/tracker-miner-rss
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/RSS
+_DisplayName=RSS/ATOM Feeds
+_Comment=Fetch RSS/ATOM Feeds
diff --git a/data/tracker-miner-rss.desktop.in.in b/src/miners/rss/tracker-miner-rss.desktop.in.in
index 49be40191..49be40191 100644
--- a/data/tracker-miner-rss.desktop.in.in
+++ b/src/miners/rss/tracker-miner-rss.desktop.in.in
diff --git a/src/miners/user-guides/.gitignore b/src/miners/user-guides/.gitignore
index b5e2e9627..53909a707 100644
--- a/src/miners/user-guides/.gitignore
+++ b/src/miners/user-guides/.gitignore
@@ -1 +1,2 @@
 tracker-miner-user-guides
+*.service
diff --git a/src/miners/user-guides/Makefile.am b/src/miners/user-guides/Makefile.am
index 5a79012cb..74aea0c86 100644
--- a/src/miners/user-guides/Makefile.am
+++ b/src/miners/user-guides/Makefile.am
@@ -20,3 +20,42 @@ tracker_miner_user_guides_LDADD =                      \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_USER_GUIDES_LIBS)
+
+# DBus interfaces (XML files) and services
+%.service.in: %.service.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Userguides.service
+
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
+	$(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+	           "$(DESTDIR)$(servicedir)/$(service_DATA)"
+
+uninstall-local:
+	$(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+
+# Desktop files: First we fix the VERSION and libexecdir
+%.desktop.in: %.desktop.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
+	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
+
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_DATA = tracker-miner-user-guides.desktop
+
+@INTLTOOL_DESKTOP_RULE@
+
+# Dist / Clean rules for all data
+CLEANFILES = \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA) \
+	$(service_DATA:.service=.service.in)
+
+EXTRA_DIST = \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(service_DATA:.service=.service.in.in)
diff --git a/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in.in b/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in.in
new file mode 100644
index 000000000..2f4857038
--- /dev/null
+++ b/src/miners/user-guides/org.freedesktop.Tracker1.Miner.Userguides.service.in.in
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Userguides
+Exec=@libexecdir@/tracker-miner-user-guides
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Userguides
+_DisplayName=Userguides
+_Comment=Userguide data miner
diff --git a/data/tracker-miner-user-guides.desktop.in.in b/src/miners/user-guides/tracker-miner-user-guides.desktop.in.in
index 4274e1a41..4274e1a41 100644
--- a/data/tracker-miner-user-guides.desktop.in.in
+++ b/src/miners/user-guides/tracker-miner-user-guides.desktop.in.in
diff --git a/data/ontologies/10-xsd.description b/src/ontologies/10-xsd.description
index 9f4c1b30f..18ede47a9 100644
--- a/data/ontologies/10-xsd.description
+++ b/src/ontologies/10-xsd.description
@@ -8,7 +8,7 @@
 	dsc:editor "David C. Fallside, IBM &lt;fallside@us.ibm.com&gt;";
 	dsc:editor "Priscilla Walmsley &lt;pwalmsley@datypic.com&gt; - Second Edition";
 	dsc:editor "Tracker developers (translation into turtle)" ;
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/10-xsd.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/10-xsd.ontology";
 
 	dsc:localPrefix "xsd" ;
 	dsc:baseUrl "http://www.w3.org/2001/XMLSchema#" ;
diff --git a/data/ontologies/10-xsd.ontology b/src/ontologies/10-xsd.ontology
index c22c5fd2b..c22c5fd2b 100644
--- a/data/ontologies/10-xsd.ontology
+++ b/src/ontologies/10-xsd.ontology
diff --git a/data/ontologies/11-rdf.description b/src/ontologies/11-rdf.description
index c17f5975d..2643af27f 100644
--- a/data/ontologies/11-rdf.description
+++ b/src/ontologies/11-rdf.description
@@ -5,7 +5,7 @@
 	dsc:description "Core RDF classes to keep the internal consistency of the ontology" ;
 	dsc:author "W3C" ;
 	dsc:editor "Tracker developers (translation into turtle)" ;
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/11-rdf.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/11-rdf.ontology";
 
 	dsc:localPrefix "rdf" ;
 	dsc:baseUrl "http://www.w3.org/2000/01/rdf-schema#" ;
diff --git a/data/ontologies/11-rdf.ontology b/src/ontologies/11-rdf.ontology
index 869f73e09..869f73e09 100644
--- a/data/ontologies/11-rdf.ontology
+++ b/src/ontologies/11-rdf.ontology
diff --git a/data/ontologies/12-nrl.description b/src/ontologies/12-nrl.description
index 9ba38a092..44a43b215 100644
--- a/data/ontologies/12-nrl.description
+++ b/src/ontologies/12-nrl.description
@@ -5,7 +5,7 @@
 	dsc:description "Properties describing the ontologies.";
 	dsc:author "Nepomuk People" ;
 	dsc:editor "Tracker developers (translation into turtle)" ;
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/12-nrl.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/12-nrl.ontology";
 
 	dsc:localPrefix "nrl" ;
 	dsc:baseUrl "http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#" ;
diff --git a/data/ontologies/12-nrl.ontology b/src/ontologies/12-nrl.ontology
index 381e0c39c..381e0c39c 100644
--- a/data/ontologies/12-nrl.ontology
+++ b/src/ontologies/12-nrl.ontology
diff --git a/data/ontologies/20-dc.description b/src/ontologies/20-dc.description
index d49b74bd7..64c4b590c 100644
--- a/data/ontologies/20-dc.description
+++ b/src/ontologies/20-dc.description
@@ -6,7 +6,7 @@
 
 	dsc:author "Dublin Core consortium" ;
 	dsc:editor "Tracker developers (translation into turtle)" ;
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/20-dc.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/20-dc.ontology";
 
 	dsc:localPrefix "dc" ;
 	dsc:baseUrl "http://purl.org/dc/elements/1.1/";
diff --git a/data/ontologies/20-dc.ontology b/src/ontologies/20-dc.ontology
index c50187d91..c50187d91 100644
--- a/data/ontologies/20-dc.ontology
+++ b/src/ontologies/20-dc.ontology
diff --git a/data/ontologies/30-nie.description b/src/ontologies/30-nie.description
index 4f909901e..9d123ca89 100644
--- a/data/ontologies/30-nie.description
+++ b/src/ontologies/30-nie.description
@@ -9,7 +9,7 @@
 	dsc:author "Michael Sintek, DFKI, &lt;michael.sintek@dfki.de&gt;";
 	dsc:author "Ludger van Elst, DFKI, &lt;elst@dfki.uni-kl.de&gt;";
 	dsc:editor "Antoni Mylka, DFKI, &lt;antoni.mylka@dfki.de&gt;";
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/30-nie.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/30-nie.ontology";
 	dsc:contributor "Evgeny 'phreedom' Egorochkin, KDE Strigi Developer, &lt;stexx@mail.ru&gt;";
 	dsc:contributor "Christiaan Fluit, Aduna, &lt;christiaan.fluit@aduna-software.com&gt;";
 
diff --git a/data/ontologies/30-nie.ontology b/src/ontologies/30-nie.ontology
index bfc6a875d..bfc6a875d 100644
--- a/data/ontologies/30-nie.ontology
+++ b/src/ontologies/30-nie.ontology
diff --git a/data/ontologies/31-nao.description b/src/ontologies/31-nao.description
index dc8b4e0f0..4a6646da6 100644
--- a/data/ontologies/31-nao.description
+++ b/src/ontologies/31-nao.description
@@ -19,7 +19,7 @@
 	dsc:contributor "Julien Gaugaz, L3S, &lt;gaugaz@l3s.de&gt;";
 	dsc:contributor "Antoni Mylka, DFKI, &lt;antoni.mylka@dfki.de&gt;";
 
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/31-nao.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/31-nao.ontology";
 	dsc:upstream "http://www.semanticdesktop.org/ontologies/nao/";
 
 	dsc:localPrefix "nao" ;
diff --git a/data/ontologies/31-nao.ontology b/src/ontologies/31-nao.ontology
index 1b3a109ca..1b3a109ca 100644
--- a/data/ontologies/31-nao.ontology
+++ b/src/ontologies/31-nao.ontology
diff --git a/data/ontologies/32-nco.description b/src/ontologies/32-nco.description
index b1b75a3eb..2f26de6da 100644
--- a/data/ontologies/32-nco.description
+++ b/src/ontologies/32-nco.description
@@ -17,7 +17,7 @@
 	dsc:contributor "Christiaan Fluit, Aduna, &lt;christiaan.fluit@aduna-software.com&gt;";
 
 	dsc:upstream "http://www.semanticdesktop.org/ontologies/nco/";
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/32-nco.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/32-nco.ontology";
 
 	dsc:localPrefix "nco" ;
 	dsc:baseUrl "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#" ;
diff --git a/data/ontologies/32-nco.ontology b/src/ontologies/32-nco.ontology
index a7c80f5ba..a7c80f5ba 100644
--- a/data/ontologies/32-nco.ontology
+++ b/src/ontologies/32-nco.ontology
diff --git a/data/ontologies/33-nfo.description b/src/ontologies/33-nfo.description
index 9ed4c5253..f7e63455d 100644
--- a/data/ontologies/33-nfo.description
+++ b/src/ontologies/33-nfo.description
@@ -4,7 +4,7 @@
 	dsc:title "Nepomuk File Ontology (NFO)" ;
 	dsc:description "About files and other desktop resources." ;
 
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/33-nfo.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/33-nfo.ontology";
 	dsc:upstream "http://www.semanticdesktop.org/ontologies/nfo/";
 
 	dsc:author "Antoni Mylka, DFKI, &lt;antoni.mylka@dfki.de&gt;";
diff --git a/data/ontologies/33-nfo.ontology b/src/ontologies/33-nfo.ontology
index e8cebafb3..e8cebafb3 100644
--- a/data/ontologies/33-nfo.ontology
+++ b/src/ontologies/33-nfo.ontology
diff --git a/data/ontologies/34-nmo.description b/src/ontologies/34-nmo.description
index a22aec70c..a22aec70c 100644
--- a/data/ontologies/34-nmo.description
+++ b/src/ontologies/34-nmo.description
diff --git a/data/ontologies/34-nmo.ontology b/src/ontologies/34-nmo.ontology
index 063753387..063753387 100644
--- a/data/ontologies/34-nmo.ontology
+++ b/src/ontologies/34-nmo.ontology
diff --git a/data/ontologies/35-ncal.description b/src/ontologies/35-ncal.description
index 9d5333575..482037d83 100644
--- a/data/ontologies/35-ncal.description
+++ b/src/ontologies/35-ncal.description
@@ -15,7 +15,7 @@
 	dsc:contributor "Evgeny 'phreedom' Egorochkin, KDE Strigi Developer, &lt;stexx@mail.ru&gt;";
 	dsc:contributor "Christiaan Fluit, Aduna, &lt;christiaan.fluit@aduna-software.com&gt;";
 
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/35-ncal.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/35-ncal.ontology";
 	dsc:upstream "http://www.semanticdesktop.org/ontologies/ncal/";
 
 	dsc:localPrefix "ncal" ;
diff --git a/data/ontologies/35-ncal.ontology b/src/ontologies/35-ncal.ontology
index 1c027c15b..1c027c15b 100644
--- a/data/ontologies/35-ncal.ontology
+++ b/src/ontologies/35-ncal.ontology
diff --git a/data/ontologies/36-scal.description b/src/ontologies/36-scal.description
index c8faf2490..d85db7b6a 100644
--- a/data/ontologies/36-scal.description
+++ b/src/ontologies/36-scal.description
@@ -5,7 +5,7 @@
 	dsc:description "Simple and efficient ontology to represent calendar information (events, ToDos, recurrency rules...)" ;
 	dsc:author "Tracker Developers" ;
 	dsc:editor "Tracker Developers" ;
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/36-scal.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/36-scal.ontology";
 
 	dsc:localPrefix "scal" ;
 	dsc:baseUrl "http://www.tracker-project.org/temp/scal#" ;
diff --git a/data/ontologies/36-scal.ontology b/src/ontologies/36-scal.ontology
index e77110418..e77110418 100644
--- a/data/ontologies/36-scal.ontology
+++ b/src/ontologies/36-scal.ontology
diff --git a/data/ontologies/37-nid3.description b/src/ontologies/37-nid3.description
index 41784adac..5f92d4829 100644
--- a/data/ontologies/37-nid3.description
+++ b/src/ontologies/37-nid3.description
@@ -5,7 +5,7 @@
 	dsc:description "Deprecated ontology to describe music. Please check NMM." ;
 	dsc:author "Nepomuk people" ;
 	dsc:editor "Tracker Developers (turtle translation)" ;
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/37-nid3.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/37-nid3.ontology";
 
 	dsc:localPrefix "nid3" ;
 	dsc:baseUrl "http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#" ;
diff --git a/data/ontologies/37-nid3.ontology b/src/ontologies/37-nid3.ontology
index 08e1d0587..08e1d0587 100644
--- a/data/ontologies/37-nid3.ontology
+++ b/src/ontologies/37-nid3.ontology
diff --git a/data/ontologies/38-nmm.description b/src/ontologies/38-nmm.description
index b8bd25934..cff616067 100644
--- a/data/ontologies/38-nmm.description
+++ b/src/ontologies/38-nmm.description
@@ -9,7 +9,7 @@
 	dsc:editor "Urho Konttori &lt;urho.konttori@nokia.com&gt;" ;
 	dsc:editor "Ivan Frade &lt;ivan.frade@nokia.com&gt;" ;
 
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/38-nmm.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/38-nmm.ontology";
 
 	dsc:localPrefix "nmm" ;
 	dsc:baseUrl "http://www.tracker-project.org/temp/nmm#" ;
diff --git a/data/ontologies/38-nmm.ontology b/src/ontologies/38-nmm.ontology
index 0137af267..0137af267 100644
--- a/data/ontologies/38-nmm.ontology
+++ b/src/ontologies/38-nmm.ontology
diff --git a/data/ontologies/39-mto.description b/src/ontologies/39-mto.description
index f4502256c..b2af3cb77 100644
--- a/data/ontologies/39-mto.description
+++ b/src/ontologies/39-mto.description
@@ -9,7 +9,7 @@
 
 	dsc:editor "Ivan Frade &lt;ivan.frade@nokia.com&gt;" ;
 
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/39-mto.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/39-mto.ontology";
 
 	dsc:localPrefix "mto" ;
 	dsc:baseUrl "http://www.tracker-project.org/temp/mto#" ;
diff --git a/data/ontologies/39-mto.ontology b/src/ontologies/39-mto.ontology
index bae2a261d..bae2a261d 100644
--- a/data/ontologies/39-mto.ontology
+++ b/src/ontologies/39-mto.ontology
diff --git a/data/ontologies/40-mlo.description b/src/ontologies/40-mlo.description
index 3f6461fc4..e724fc6c1 100644
--- a/data/ontologies/40-mlo.description
+++ b/src/ontologies/40-mlo.description
@@ -7,7 +7,7 @@
 	dsc:author "Ivan Frade &lt;ivan.frade@nokia.com&gt;" ;
 	dsc:editor "Ivan Frade &lt;ivan.frade@nokia.com&gt;" ;
 
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/40-mlo.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/40-mlo.ontology";
 
 	dsc:baseUrl "http://www.tracker-project.org/temp/mlo#" ;
 	dsc:localPrefix "mlo" ;
diff --git a/data/ontologies/40-mlo.ontology b/src/ontologies/40-mlo.ontology
index 3fc36b69e..3fc36b69e 100644
--- a/data/ontologies/40-mlo.ontology
+++ b/src/ontologies/40-mlo.ontology
diff --git a/data/ontologies/41-mfo.description b/src/ontologies/41-mfo.description
index 146580faa..75e9663e1 100644
--- a/data/ontologies/41-mfo.description
+++ b/src/ontologies/41-mfo.description
@@ -9,7 +9,7 @@
 
 	dsc:editor "Ivan Frade &lt;ivan.frade@nokia.com&gt;" ;
 
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/41-mfo.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/41-mfo.ontology";
 
 	dsc:localPrefix "mfo" ;
 	dsc:baseUrl "http://www.tracker-project.org/temp/mfo#" ;
diff --git a/data/ontologies/41-mfo.ontology b/src/ontologies/41-mfo.ontology
index 0949cbb46..0949cbb46 100644
--- a/data/ontologies/41-mfo.ontology
+++ b/src/ontologies/41-mfo.ontology
diff --git a/data/ontologies/89-mtp.description b/src/ontologies/89-mtp.description
index 2123e7eb1..aaf081553 100644
--- a/data/ontologies/89-mtp.description
+++ b/src/ontologies/89-mtp.description
@@ -6,7 +6,7 @@
 
 	dsc:author "Ivan Frade &lt;ivan.frade@nokia.com&gt;" ;
 	dsc:editor "Ivan Frade &lt;ivan.frade@nokia.com&gt;" ;
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/89-mtp.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/89-mtp.ontology";
 
 	dsc:localPrefix "mtp" ;
 	dsc:baseUrl "http://www.tracker-project.org/temp/mtp#" ;
diff --git a/data/ontologies/89-mtp.ontology b/src/ontologies/89-mtp.ontology
index 82265169a..82265169a 100644
--- a/data/ontologies/89-mtp.ontology
+++ b/src/ontologies/89-mtp.ontology
diff --git a/data/ontologies/90-tracker.description b/src/ontologies/90-tracker.description
index e725509f7..b01c9e23e 100644
--- a/data/ontologies/90-tracker.description
+++ b/src/ontologies/90-tracker.description
@@ -6,7 +6,7 @@
 
 	dsc:author "Tracker developers" ;
 	dsc:editor "Tracker developers" ;
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/90-tracker.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/90-tracker.ontology";
 
 	dsc:localPrefix "tracker" ;
 	dsc:baseUrl "http://www.tracker-project.org/ontologies/tracker#";
diff --git a/data/ontologies/90-tracker.ontology b/src/ontologies/90-tracker.ontology
index 565268c46..565268c46 100644
--- a/data/ontologies/90-tracker.ontology
+++ b/src/ontologies/90-tracker.ontology
diff --git a/data/ontologies/91-maemo.description b/src/ontologies/91-maemo.description
index cd98266ca..b0e97a862 100644
--- a/data/ontologies/91-maemo.description
+++ b/src/ontologies/91-maemo.description
@@ -6,7 +6,7 @@
 
 	dsc:author "Tracker developers" ;
 	dsc:editor "Tracker developers" ;
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/91-maemo.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/91-maemo.ontology";
 
 	dsc:localPrefix "maemo" ;
 	dsc:baseUrl "http://maemo.org/ontologies/tracker#" ;
diff --git a/data/ontologies/91-maemo.ontology b/src/ontologies/91-maemo.ontology
index 1bd658e18..1bd658e18 100644
--- a/data/ontologies/91-maemo.ontology
+++ b/src/ontologies/91-maemo.ontology
diff --git a/data/ontologies/92-slo.description b/src/ontologies/92-slo.description
index e07e61e34..7f648ee95 100644
--- a/data/ontologies/92-slo.description
+++ b/src/ontologies/92-slo.description
@@ -7,7 +7,7 @@
 	dsc:author "Ivan Frade &lt;ivan.frade@nokia.com&gt;" ;
 	dsc:editor "Ivan Frade &lt;ivan.frade@nokia.com&gt;" ;
 
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/92-slo.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/92-slo.ontology";
 
 	dsc:baseUrl "http://www.tracker-project.org/temp/slo#" ;
 	dsc:localPrefix "slo" ;
diff --git a/data/ontologies/92-slo.ontology b/src/ontologies/92-slo.ontology
index 7d71dcbac..7d71dcbac 100644
--- a/data/ontologies/92-slo.ontology
+++ b/src/ontologies/92-slo.ontology
diff --git a/data/ontologies/93-libosinfo.description b/src/ontologies/93-libosinfo.description
index 290c12344..41c78c87d 100644
--- a/data/ontologies/93-libosinfo.description
+++ b/src/ontologies/93-libosinfo.description
@@ -6,7 +6,7 @@
 
 	dsc:author "Red Hat, Inc" ;
 	dsc:editor "Red Hat, Inc" ;
-	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/93-libosinfo.ontology";
+	dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/93-libosinfo.ontology";
 
 	dsc:localPrefix "osinfo" ;
 	dsc:baseUrl "http://www.tracker-project.org/ontologies/osinfo#";
diff --git a/data/ontologies/93-libosinfo.ontology b/src/ontologies/93-libosinfo.ontology
index 9358d56c6..9358d56c6 100644
--- a/data/ontologies/93-libosinfo.ontology
+++ b/src/ontologies/93-libosinfo.ontology
diff --git a/data/ontologies/Indices.list b/src/ontologies/Indices.list
index cfcd7f412..cfcd7f412 100644
--- a/data/ontologies/Indices.list
+++ b/src/ontologies/Indices.list
diff --git a/data/ontologies/Makefile.am b/src/ontologies/Makefile.am
index cefd1d08f..d898b8a14 100644
--- a/data/ontologies/Makefile.am
+++ b/src/ontologies/Makefile.am
@@ -26,11 +26,10 @@ config_DATA =                                          \
 	93-libosinfo.ontology 93-libosinfo.description
 
 if HAVE_MAEMO
-config_DATA +=                                         \
-	$(maemo_ontology)
+config_DATA += $(maemo_ontology)
 endif
 
-EXTRA_DIST =                                           \
-	$(maemo_ontology)                              \
+EXTRA_DIST = \
+	$(maemo_ontology) \
 	$(config_DATA)
 
diff --git a/src/plugins/evolution/.gitignore b/src/plugins/evolution/.gitignore
index f92a4cec7..954b62057 100644
--- a/src/plugins/evolution/.gitignore
+++ b/src/plugins/evolution/.gitignore
@@ -1 +1,2 @@
 *.eplug
+*.service
diff --git a/src/plugins/evolution/Makefile.am b/src/plugins/evolution/Makefile.am
index dd9823d82..595613a32 100644
--- a/src/plugins/evolution/Makefile.am
+++ b/src/plugins/evolution/Makefile.am
@@ -35,14 +35,39 @@ liborg_freedesktop_Tracker_evolution_plugin_la_LIBADD = \
 	$(BUILD_LIBS)                                  \
 	$(TRACKER_MINER_EVOLUTION_LIBS)
 
-@INTLTOOL_DESKTOP_RULE@
+BUILT_SOURCES = $(eplugin_DATA)
 
-BUILT_SOURCES =                                        \
+CLEANFILES = \
+	$(BUILT_SOURCES) \
 	$(eplugin_DATA)
 
-CLEANFILES =                                           \
-	$(BUILT_SOURCES)                               \
-	$(eplugin_DATA)
+EXTRA_DIST = org-freedesktop-Tracker-evolution-plugin.eplug.xml
+
+# DBus interfaces (XML files) and services
+%.service.in: %.service.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.EMails.service
+
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
+	$(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+	           "$(DESTDIR)$(servicedir)/$(service_DATA)"
+
+uninstall-local:
+	$(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+
+# Dist / Clean rules for all data
+CLEANFILES += \
+	$(autostart_DATA) \
+	$(desktop_in_files) \
+	$(service_DATA) \
+	$(service_DATA:.service=.service.in)
 
-EXTRA_DIST =                                           \
-	org-freedesktop-Tracker-evolution-plugin.eplug.xml
+EXTRA_DIST += \
+	$(desktop_in_in_files) \
+	$(service_DATA:.service=.service.in.in)
diff --git a/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in.in b/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in.in
new file mode 100644
index 000000000..e9b233eed
--- /dev/null
+++ b/src/plugins/evolution/org.freedesktop.Tracker1.Miner.EMails.service.in.in
@@ -0,0 +1,7 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Emails
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Emails
+_DisplayName=Emails
+_Comment=Evolution Email miner
diff --git a/src/tracker-extract/.gitignore b/src/tracker-extract/.gitignore
index 9765d48b2..7e3acbdf3 100644
--- a/src/tracker-extract/.gitignore
+++ b/src/tracker-extract/.gitignore
@@ -2,4 +2,6 @@ tracker-extract
 tracker-extract-priority-dbus-stamp
 tracker-extract-priority-dbus.c
 tracker-extract-priority-dbus.h
-
+*.service
+*.xml
+*.valid
diff --git a/src/tracker-extract/Makefile.am b/src/tracker-extract/Makefile.am
index 31f86edca..6a0b58f61 100644
--- a/src/tracker-extract/Makefile.am
+++ b/src/tracker-extract/Makefile.am
@@ -571,12 +571,12 @@ tracker-extract-priority-dbus.c: tracker-extract-priority-dbus-stamp
 tracker-extract-priority-dbus.h: tracker-extract-priority-dbus-stamp
 	@:
 
-tracker-extract-priority-dbus-stamp: Makefile.am $(top_srcdir)/data/dbus/tracker-extract-priority.xml
+tracker-extract-priority-dbus-stamp: Makefile.am $(top_srcdir)/src/tracker-extract/tracker-extract-priority.xml
 	$(AM_V_GEN) $(GDBUS_CODEGEN) \
 	              --interface-prefix org.freedesktop.Tracker1.Extract. \
 	              --generate-c-code tracker-extract-priority-dbus \
 	              --c-namespace TrackerExtractDBus \
-	              $(top_srcdir)/data/dbus/tracker-extract-priority.xml
+	              $(top_srcdir)/src/tracker-extract/tracker-extract-priority.xml
 	touch $@
 
 BUILT_SOURCES = \
@@ -587,5 +587,61 @@ BUILT_SOURCES = \
 
 CLEANFILES = $(BUILT_SOURCES)
 
-EXTRA_DIST = \
-	$(rules_files)
+EXTRA_DIST = $(rules_files)
+
+# DBus interfaces (XML files) and services
+configdir = $(datadir)/tracker
+config_DATA = \
+	tracker-extract.xml \
+	tracker-extract-priority.xml
+
+%.service.in: %.service.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Miner.Extract.service
+
+INTLTOOL_SERVICE_RULE='%.service:   %.service.in   $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< [$]@ -d -u'
+@INTLTOOL_SERVICE_RULE@
+
+install-data-hook:
+	$(MKDIR_P) "$(DESTDIR)$(datadir)/tracker/miners" && \
+	$(LN_S) -f "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)" \
+	           "$(DESTDIR)$(servicedir)/$(service_DATA)"
+
+uninstall-local:
+	$(RM) "$(DESTDIR)$(datadir)/tracker/miners/$(service_DATA)"
+
+# Desktop files: First we fix the VERSION and libexecdir
+%.desktop.in: %.desktop.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
+	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
+
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_DATA = tracker-extract.desktop
+
+@INTLTOOL_DESKTOP_RULE@
+
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+
+gsettings_SCHEMAS = org.freedesktop.Tracker.Extract.gschema.xml
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+CLEANFILES += \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA) \
+	$(service_DATA:.service=.service.in) \
+	$(gsettings_SCHEMAS)
+
+EXTRA_DIST += \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(config_DATA) \
+	$(service_DATA:.service=.service.in.in) \
+	$(gsettings_SCHEMAS:.xml=.xml.in)
diff --git a/data/gschemas/org.freedesktop.Tracker.Extract.gschema.xml.in b/src/tracker-extract/org.freedesktop.Tracker.Extract.gschema.xml.in
index af8c0f0af..af8c0f0af 100644
--- a/data/gschemas/org.freedesktop.Tracker.Extract.gschema.xml.in
+++ b/src/tracker-extract/org.freedesktop.Tracker.Extract.gschema.xml.in
diff --git a/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
new file mode 100644
index 000000000..5c4ad1411
--- /dev/null
+++ b/src/tracker-extract/org.freedesktop.Tracker1.Miner.Extract.service.in.in
@@ -0,0 +1,8 @@
+[D-BUS Service]
+Name=org.freedesktop.Tracker1.Miner.Extract
+Exec=@libexecdir@/tracker-extract
+
+# Miner details needed for tracker-control
+Path=/org/freedesktop/Tracker1/Miner/Extract
+_DisplayName=Extractor
+_Comment=Metadata extractor
diff --git a/data/dbus/tracker-extract-priority.xml b/src/tracker-extract/tracker-extract-priority.xml
index 2220177cb..2220177cb 100644
--- a/data/dbus/tracker-extract-priority.xml
+++ b/src/tracker-extract/tracker-extract-priority.xml
diff --git a/data/tracker-extract.desktop.in.in b/src/tracker-extract/tracker-extract.desktop.in.in
index f832b32a2..f832b32a2 100644
--- a/data/tracker-extract.desktop.in.in
+++ b/src/tracker-extract/tracker-extract.desktop.in.in
diff --git a/data/dbus/tracker-extract.xml b/src/tracker-extract/tracker-extract.xml
index fff17eddf..fff17eddf 100644
--- a/data/dbus/tracker-extract.xml
+++ b/src/tracker-extract/tracker-extract.xml
diff --git a/src/tracker-needle/Makefile.am b/src/tracker-needle/Makefile.am
index cab7b991f..2b00b4cc0 100644
--- a/src/tracker-needle/Makefile.am
+++ b/src/tracker-needle/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
 bin_PROGRAMS = tracker-needle
 
 AM_VALAFLAGS = \
diff --git a/data/icons/16x16/Makefile.am b/src/tracker-needle/icons/16x16/Makefile.am
index 52782da46..52782da46 100644
--- a/data/icons/16x16/Makefile.am
+++ b/src/tracker-needle/icons/16x16/Makefile.am
diff --git a/data/icons/16x16/tracker.png b/src/tracker-needle/icons/16x16/tracker.png
index 0048e022b..0048e022b 100644
--- a/data/icons/16x16/tracker.png
+++ b/src/tracker-needle/icons/16x16/tracker.png
diff --git a/data/icons/22x22/Makefile.am b/src/tracker-needle/icons/22x22/Makefile.am
index 60ba12bf6..60ba12bf6 100644
--- a/data/icons/22x22/Makefile.am
+++ b/src/tracker-needle/icons/22x22/Makefile.am
diff --git a/data/icons/22x22/tracker.png b/src/tracker-needle/icons/22x22/tracker.png
index ea038072d..ea038072d 100644
--- a/data/icons/22x22/tracker.png
+++ b/src/tracker-needle/icons/22x22/tracker.png
diff --git a/data/icons/24x24/Makefile.am b/src/tracker-needle/icons/24x24/Makefile.am
index 573bf12e5..573bf12e5 100644
--- a/data/icons/24x24/Makefile.am
+++ b/src/tracker-needle/icons/24x24/Makefile.am
diff --git a/data/icons/24x24/tracker.png b/src/tracker-needle/icons/24x24/tracker.png
index 4de00ab31..4de00ab31 100644
--- a/data/icons/24x24/tracker.png
+++ b/src/tracker-needle/icons/24x24/tracker.png
diff --git a/data/icons/32x32/Makefile.am b/src/tracker-needle/icons/32x32/Makefile.am
index 19b2311ef..19b2311ef 100644
--- a/data/icons/32x32/Makefile.am
+++ b/src/tracker-needle/icons/32x32/Makefile.am
diff --git a/data/icons/32x32/tracker.png b/src/tracker-needle/icons/32x32/tracker.png
index 96089db9f..96089db9f 100644
--- a/data/icons/32x32/tracker.png
+++ b/src/tracker-needle/icons/32x32/tracker.png
diff --git a/data/icons/48x48/Makefile.am b/src/tracker-needle/icons/48x48/Makefile.am
index 239df51ab..239df51ab 100644
--- a/data/icons/48x48/Makefile.am
+++ b/src/tracker-needle/icons/48x48/Makefile.am
diff --git a/data/icons/48x48/tracker.png b/src/tracker-needle/icons/48x48/tracker.png
index 497f2a2a3..497f2a2a3 100644
--- a/data/icons/48x48/tracker.png
+++ b/src/tracker-needle/icons/48x48/tracker.png
diff --git a/data/icons/Makefile.am b/src/tracker-needle/icons/Makefile.am
index 2d5974d2c..2d5974d2c 100644
--- a/data/icons/Makefile.am
+++ b/src/tracker-needle/icons/Makefile.am
diff --git a/data/icons/scalable/Makefile.am b/src/tracker-needle/icons/scalable/Makefile.am
index bb3899cfd..bb3899cfd 100644
--- a/data/icons/scalable/Makefile.am
+++ b/src/tracker-needle/icons/scalable/Makefile.am
diff --git a/data/icons/scalable/tracker.svg b/src/tracker-needle/icons/scalable/tracker.svg
index 7655d24ac..7655d24ac 100644
--- a/data/icons/scalable/tracker.svg
+++ b/src/tracker-needle/icons/scalable/tracker.svg
diff --git a/src/tracker-store/.gitignore b/src/tracker-store/.gitignore
index af38b38cc..4045ead9c 100644
--- a/src/tracker-store/.gitignore
+++ b/src/tracker-store/.gitignore
@@ -8,3 +8,6 @@ tracker-status.c
 tracker-steroids.c
 tracker-store.c
 tracker-store.h
+*.service
+*.xml
+*.valid
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index 3a7a45cb6..1097e54ee 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -65,3 +65,55 @@ EXTRA_DIST = \
 	tracker-events.vapi \
 	tracker-locale-change.vapi \
 	tracker-writeback.vapi
+
+
+# DBus interfaces (XML files) and services
+configdir = $(datadir)/tracker
+config_DATA = \
+	tracker-backup.xml \
+	tracker-resources.xml \
+	tracker-statistics.xml \
+	tracker-status.xml
+
+%.service: %.service.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.service
+
+# Desktop files: First we fix the VERSION and libexecdir
+%.desktop.in: %.desktop.in.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" \
+	     -e "s|@VERSION[@]|${VERSION}|" $< > $@
+
+autostartdir = $(sysconfdir)/xdg/autostart
+autostart_DATA = tracker-store.desktop
+
+@INTLTOOL_DESKTOP_RULE@
+
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+
+gsettings_SCHEMAS = \
+	org.freedesktop.Tracker.gschema.xml \
+	org.freedesktop.Tracker.Store.gschema.xml
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+CLEANFILES = \
+	$(autostart_DATA) \
+	$(autostart_DATA:.desktop=.desktop.in) \
+	$(service_DATA) \
+	$(gsettings_SCHEMAS)
+
+EXTRA_DIST += \
+	$(autostart_DATA:.desktop=.desktop.in.in) \
+	$(service_DATA:.service=.service.in) \
+	$(config_DATA) \
+	$(gsettings_SCHEMAS:.xml=.xml.in)
+
+
diff --git a/data/gschemas/org.freedesktop.Tracker.Store.gschema.xml.in b/src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml.in
index f5e9f9623..f5e9f9623 100644
--- a/data/gschemas/org.freedesktop.Tracker.Store.gschema.xml.in
+++ b/src/tracker-store/org.freedesktop.Tracker.Store.gschema.xml.in
diff --git a/data/gschemas/org.freedesktop.Tracker.gschema.xml.in b/src/tracker-store/org.freedesktop.Tracker.gschema.xml.in
index b9ddc1d12..b9ddc1d12 100644
--- a/data/gschemas/org.freedesktop.Tracker.gschema.xml.in
+++ b/src/tracker-store/org.freedesktop.Tracker.gschema.xml.in
diff --git a/data/dbus/org.freedesktop.Tracker1.service.in b/src/tracker-store/org.freedesktop.Tracker1.service.in
index 77edc00be..77edc00be 100644
--- a/data/dbus/org.freedesktop.Tracker1.service.in
+++ b/src/tracker-store/org.freedesktop.Tracker1.service.in
diff --git a/data/dbus/tracker-backup.xml b/src/tracker-store/tracker-backup.xml
index d079eee15..d079eee15 100644
--- a/data/dbus/tracker-backup.xml
+++ b/src/tracker-store/tracker-backup.xml
diff --git a/data/dbus/tracker-resources.xml b/src/tracker-store/tracker-resources.xml
index 6c1287faa..6c1287faa 100644
--- a/data/dbus/tracker-resources.xml
+++ b/src/tracker-store/tracker-resources.xml
diff --git a/data/dbus/tracker-statistics.xml b/src/tracker-store/tracker-statistics.xml
index 1f4742e45..1f4742e45 100644
--- a/data/dbus/tracker-statistics.xml
+++ b/src/tracker-store/tracker-statistics.xml
diff --git a/data/dbus/tracker-status.xml b/src/tracker-store/tracker-status.xml
index e30993953..e30993953 100644
--- a/data/dbus/tracker-status.xml
+++ b/src/tracker-store/tracker-status.xml
diff --git a/data/tracker-store.desktop.in.in b/src/tracker-store/tracker-store.desktop.in.in
index 78e855d0b..78e855d0b 100644
--- a/data/tracker-store.desktop.in.in
+++ b/src/tracker-store/tracker-store.desktop.in.in
diff --git a/src/tracker-writeback/.gitignore b/src/tracker-writeback/.gitignore
index c9e76fd19..a6d2e3850 100644
--- a/src/tracker-writeback/.gitignore
+++ b/src/tracker-writeback/.gitignore
@@ -1 +1,4 @@
 tracker-writeback
+*.service
+*.xml
+*.valid
diff --git a/src/tracker-writeback/Makefile.am b/src/tracker-writeback/Makefile.am
index bac5dc1d3..89959b8b5 100644
--- a/src/tracker-writeback/Makefile.am
+++ b/src/tracker-writeback/Makefile.am
@@ -62,3 +62,33 @@ tracker_writeback_LDADD = \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la \
 	$(BUILD_LIBS) \
 	$(TRACKER_WRITEBACK_LIBS)
+
+# DBus interfaces (XML files) and services
+configdir = $(datadir)/tracker
+config_DATA = tracker-writeback.xml
+
+%.service: %.service.in
+	@sed -e "s|@libexecdir[@]|${libexecdir}|" $< > $@
+
+servicedir = $(DBUS_SERVICES_DIR)
+service_DATA = org.freedesktop.Tracker1.Writeback.service
+
+# Configuration / GSettings
+gsettings_ENUM_NAMESPACE = org.freedesktop.Tracker
+gsettings_ENUM_FILES = $(top_srcdir)/src/libtracker-common/tracker-enums.h
+
+gsettings_SCHEMAS = org.freedesktop.Tracker.Writeback.gschema.xml
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+
+# Dist / Clean rules for all data
+CLEANFILES = \
+	$(service_DATA) \
+	$(gsettings_SCHEMAS)
+
+EXTRA_DIST = \
+	$(service_DATA:.service=.service.in) \
+	$(config_DATA) \
+	$(gsettings_SCHEMAS:.xml=.xml.in)
diff --git a/data/gschemas/org.freedesktop.Tracker.Writeback.gschema.xml.in b/src/tracker-writeback/org.freedesktop.Tracker.Writeback.gschema.xml.in
index 093e788ba..093e788ba 100644
--- a/data/gschemas/org.freedesktop.Tracker.Writeback.gschema.xml.in
+++ b/src/tracker-writeback/org.freedesktop.Tracker.Writeback.gschema.xml.in
diff --git a/data/dbus/org.freedesktop.Tracker1.Writeback.service.in b/src/tracker-writeback/org.freedesktop.Tracker1.Writeback.service.in
index a6924709b..a6924709b 100644
--- a/data/dbus/org.freedesktop.Tracker1.Writeback.service.in
+++ b/src/tracker-writeback/org.freedesktop.Tracker1.Writeback.service.in
diff --git a/data/dbus/tracker-writeback.xml b/src/tracker-writeback/tracker-writeback.xml
index 50d1aaec1..50d1aaec1 100644
--- a/data/dbus/tracker-writeback.xml
+++ b/src/tracker-writeback/tracker-writeback.xml
diff --git a/tests/functional-tests/310-fts-indexing.py b/tests/functional-tests/310-fts-indexing.py
index 33e2adf1b..78010f7df 100755
--- a/tests/functional-tests/310-fts-indexing.py
+++ b/tests/functional-tests/310-fts-indexing.py
@@ -285,7 +285,7 @@ class MinerFTSStopwordsTest (CommonMinerFTS):
         if "_" in langcode:
             langcode = langcode.split ("_")[0]
 
-        stopwordsfile = os.path.join (cfg.DATADIR, "tracker", "languages", "stopwords." + langcode)
+        stopwordsfile = os.path.join (cfg.DATADIR, "tracker", "stop-words", "stopwords." + langcode)
 
         if not os.path.exists (stopwordsfile):
             self.skipTest ("No stopwords for the current locale ('%s' doesn't exist)" % (stopwordsfile))
diff --git a/tests/functional-tests/fts-tc.py b/tests/functional-tests/fts-tc.py
index 1c5686dd3..620802b24 100644
--- a/tests/functional-tests/fts-tc.py
+++ b/tests/functional-tests/fts-tc.py
@@ -469,7 +469,7 @@ class stopwords (TestUpdate):
 	file_path =  configuration.MYDOCS + TEST_TEXT                   
                                                                         
         """copy the test files """                                      
-	test_file='/usr/share/tracker/languages/stopwords.en'
+	test_file='/usr/share/tracker/stop-words/stopwords.en'
 	f1=open(test_file,'r')
 	lines = f1.readlines()
 	f1.close()
diff --git a/tests/libtracker-data/tracker-backup-test.c b/tests/libtracker-data/tracker-backup-test.c
index 74228daec..d9788a514 100644
--- a/tests/libtracker-data/tracker-backup-test.c
+++ b/tests/libtracker-data/tracker-backup-test.c
@@ -246,7 +246,7 @@ setup (TestInfo      *info,
 
 		g_assert_true (g_setenv ("XDG_DATA_HOME", xdg_location, TRUE));
 		g_assert_true (g_setenv ("XDG_CACHE_HOME", xdg_location, TRUE));
-		g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE));
+		g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/src/ontologies/", TRUE));
 	}
 }
 
diff --git a/tests/libtracker-data/tracker-ontology-change-test.c b/tests/libtracker-data/tracker-ontology-change-test.c
index a650768ad..1f15efd5c 100644
--- a/tests/libtracker-data/tracker-ontology-change-test.c
+++ b/tests/libtracker-data/tracker-ontology-change-test.c
@@ -318,7 +318,7 @@ main (int argc, char **argv)
 
 	g_setenv ("XDG_DATA_HOME", data_dir, TRUE);
 	g_setenv ("XDG_CACHE_HOME", data_dir, TRUE);
-	g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE);
+	g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/src/ontologies/", TRUE);
 
 	/* add test cases */
 
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c
index 307ccf682..ce5bce857 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/libtracker-data/tracker-ontology-test.c
@@ -292,7 +292,7 @@ setup (TestInfo *info,
 
 		g_assert_true (g_setenv ("XDG_DATA_HOME", xdg_location, TRUE));
 		g_assert_true (g_setenv ("XDG_CACHE_HOME", xdg_location, TRUE));
-		g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE));
+		g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/src/ontologies/", TRUE));
 	}
 }
 
diff --git a/tests/libtracker-data/tracker-sparql-blank-test.c b/tests/libtracker-data/tracker-sparql-blank-test.c
index d3b795cee..da6c8bdee 100644
--- a/tests/libtracker-data/tracker-sparql-blank-test.c
+++ b/tests/libtracker-data/tracker-sparql-blank-test.c
@@ -147,7 +147,7 @@ setup (TestInfo      *info,
 
 		g_assert_true (g_setenv ("XDG_DATA_HOME", xdg_location, TRUE));
 		g_assert_true (g_setenv ("XDG_CACHE_HOME", xdg_location, TRUE));
-		g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE));
+		g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/src/ontologies/", TRUE));
 	}
 }
 
diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/libtracker-data/tracker-sparql-test.c
index 939bb31e0..4ecec7239 100644
--- a/tests/libtracker-data/tracker-sparql-test.c
+++ b/tests/libtracker-data/tracker-sparql-test.c
@@ -340,7 +340,7 @@ setup (TestInfo      *info,
 
 		g_assert_true (g_setenv ("XDG_DATA_HOME", xdg_location, TRUE));
 		g_assert_true (g_setenv ("XDG_CACHE_HOME", xdg_location, TRUE));
-		g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE));
+		g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/src/ontologies/", TRUE));
 	}
 }
 
diff --git a/tests/libtracker-fts/tracker-fts-test.c b/tests/libtracker-fts/tracker-fts-test.c
index 7adcd5fb2..5b301b6ee 100644
--- a/tests/libtracker-fts/tracker-fts-test.c
+++ b/tests/libtracker-fts/tracker-fts-test.c
@@ -187,7 +187,7 @@ main (int argc, char **argv)
 
 	g_setenv ("XDG_DATA_HOME", current_dir, TRUE);
 	g_setenv ("XDG_CACHE_HOME", current_dir, TRUE);
-	g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE);
+	g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/src/ontologies/", TRUE);
 	g_setenv ("TRACKER_FTS_STOP_WORDS", "0", TRUE);
 
 	g_free (current_dir);
diff --git a/tests/libtracker-fts/tracker-parser-test.c b/tests/libtracker-fts/tracker-parser-test.c
index 50e3402e2..7596742a0 100644
--- a/tests/libtracker-fts/tracker-parser-test.c
+++ b/tests/libtracker-fts/tracker-parser-test.c
@@ -359,7 +359,7 @@ main (int argc, char **argv)
 	 *  need to set the following envvar with the path where the
 	 *  dictionaries are. */
 	g_setenv ("TRACKER_LANGUAGE_STOP_WORDS_DIR",
-	          TOP_SRCDIR "/data/languages",
+	          TOP_SRCDIR "/src/libtracker-common/stop-words",
 	          TRUE);
 
 	/* Add normalization checks */
diff --git a/utils/ontology/README.example b/utils/ontology/README.example
index 42edbc52d..48277a2bc 100644
--- a/utils/ontology/README.example
+++ b/utils/ontology/README.example
@@ -9,7 +9,7 @@
 
    E.g.
 
- ./ttl2html -f ../../data/ontologies/39-mto.ontology -u http://www.tracker-project.org/temp/mto#
+   ./ttl2html -f ../../src/ontologies/39-mto.ontology -u http://www.tracker-project.org/temp/mto#
 
 
 == ontology-validator ==
@@ -20,7 +20,7 @@
 
    It receives as parameter the ontology files directory. Usually:
 
- ./ontology-validator -o ../../data/ontologies
+   ./ontology-validator -o ../../src/ontologies
 
 
 == Deprecated ==
diff --git a/utils/sandbox/tracker-sandbox.py b/utils/sandbox/tracker-sandbox.py
index de8d9f686..7018432a0 100755
--- a/utils/sandbox/tracker-sandbox.py
+++ b/utils/sandbox/tracker-sandbox.py
@@ -349,7 +349,7 @@ def environment_set():
 
 		os.environ['TRACKER_DB_ONTOLOGIES_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 'ontologies')
 		os.environ['TRACKER_EXTRACTOR_RULES_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 'extract-rules')
-		os.environ['TRACKER_LANGUAGE_STOPWORDS_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 'languages')
+		os.environ['TRACKER_LANGUAGE_STOPWORDS_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 'stop-words')
 
 	# Preferences
 	os.environ['TRACKER_USE_CONFIG_FILES'] = 'yes'