diff --git a/tracker-extras.changes b/tracker-extras.changes
index 2290cc4..3a39721 100644
--- a/tracker-extras.changes
+++ b/tracker-extras.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul  3 13:23:28 UTC 2013 - fcrozat@suse.com
+
+- No longer build tracker-miner-firefox, it doesn't work for
+  months, there is no point in shipping it for now.
+- Own /usr/share/mozilla and /usr/share/mozilla/extensions
+  directories in tracker-miner-thunderbird subpackage.
+
 -------------------------------------------------------------------
 Wed May  1 20:24:26 UTC 2013 - dimstar@opensuse.org
 
diff --git a/tracker-extras.spec b/tracker-extras.spec
index cbaef4b..b58e7a1 100644
--- a/tracker-extras.spec
+++ b/tracker-extras.spec
@@ -28,7 +28,7 @@
 %define build_thunderbird 0
 %else
 %define build_evo 0
-%define build_firefox 1
+%define build_firefox 0
 %define build_gui 1
 %define build_miner_rss 1
 %define build_nautilus 1
@@ -772,6 +772,8 @@ rm -rf %{buildroot}
 
 %files -n %{_name}-miner-thunderbird
 %defattr(-,root,root)
+%dir %{_datadir}/mozilla
+%dir %{_datadir}/mozilla/extensions
 %dir %{_datadir}/mozilla/extensions/%{thunderbird_appid}
 %{_datadir}/mozilla/extensions/%{thunderbird_appid}/trackerbird@bustany.org/
 %dir %{_datadir}/xul-ext
diff --git a/tracker.changes b/tracker.changes
index 2290cc4..3a39721 100644
--- a/tracker.changes
+++ b/tracker.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed Jul  3 13:23:28 UTC 2013 - fcrozat@suse.com
+
+- No longer build tracker-miner-firefox, it doesn't work for
+  months, there is no point in shipping it for now.
+- Own /usr/share/mozilla and /usr/share/mozilla/extensions
+  directories in tracker-miner-thunderbird subpackage.
+
 -------------------------------------------------------------------
 Wed May  1 20:24:26 UTC 2013 - dimstar@opensuse.org
 
diff --git a/tracker.spec b/tracker.spec
index ab443e7..27d31f4 100644
--- a/tracker.spec
+++ b/tracker.spec
@@ -28,7 +28,7 @@
 %define build_thunderbird 0
 %else
 %define build_evo 0
-%define build_firefox 1
+%define build_firefox 0
 %define build_gui 1
 %define build_miner_rss 1
 %define build_nautilus 1
@@ -771,6 +771,8 @@ rm -rf %{buildroot}
 
 %files -n %{_name}-miner-thunderbird
 %defattr(-,root,root)
+%dir %{_datadir}/mozilla
+%dir %{_datadir}/mozilla/extensions
 %dir %{_datadir}/mozilla/extensions/%{thunderbird_appid}
 %{_datadir}/mozilla/extensions/%{thunderbird_appid}/trackerbird@bustany.org/
 %dir %{_datadir}/xul-ext