Index: src/trackerd/tracker-utils.c
===================================================================
--- src/trackerd/tracker-utils.c	(Revision 394)
+++ src/trackerd/tracker-utils.c	(Arbeitskopie)
@@ -1754,7 +1754,7 @@ tracker_ignore_file (const char *uri)
 
 	name = g_path_get_basename (uri);
 
-	if (name[0] == '.') {
+	if (name[0] == '.' && !tracker->enable_hidden_file_indexing) {
 		g_free (name);
 		return TRUE;
 	}
@@ -1976,6 +1976,8 @@ tracker_load_config_file ()
 					 "[Indexing]\n",
 					 "# Disables the indexing process\n",
 					 "EnableIndexing=true\n",
+					 "# Enables the indexing process for hidden files\n",
+					 "EnableHiddenFileIndexing=false\n",
 					 "# Enables indexing of a file's text contents\n",
 					 "EnableFileContentIndexing=true\n",
 					 "# Enables generation of thumbnails\n",
@@ -2067,12 +2069,17 @@ tracker_load_config_file ()
 		tracker->enable_watching = g_key_file_get_boolean (key_file, "Watches", "EnableWatching", NULL);
 	}
 
-
 	/* Indexing options */
 
 	if (g_key_file_has_key (key_file, "Indexing", "EnableIndexing", NULL)) {
 		tracker->enable_indexing = g_key_file_get_boolean (key_file, "Indexing", "EnableIndexing", NULL);
 	}
+	
+	if (g_key_file_has_key (key_file, "Indexing", "EnableHiddenFileIndexing", NULL)) {
+		tracker->enable_hidden_file_indexing = g_key_file_get_boolean (key_file, "Indexing", "EnableHiddenFileIndexing", NULL);
+		tracker->no_watch_directory_list = g_slist_prepend (tracker->no_watch_directory_list, g_build_filename (g_get_home_dir (), ".Tracker", NULL));
+	}
+
 
 	if (g_key_file_has_key (key_file, "Indexing", "EnableFileContentIndexing", NULL)) {
 		tracker->enable_content_indexing = g_key_file_get_boolean (key_file, "Indexing", "EnableFileContentIndexing", NULL);
Index: src/trackerd/tracker-utils.h
===================================================================
--- src/trackerd/tracker-utils.h	(Revision 394)
+++ src/trackerd/tracker-utils.h	(Arbeitskopie)
@@ -92,6 +92,7 @@ typedef struct {
 	GSList		*no_index_file_types;
 
 	gboolean	enable_indexing;
+	gboolean	enable_hidden_file_indexing;
 	gboolean	enable_watching; /* can disable all forms of directory watching */
 	gboolean	enable_content_indexing; /* enables indexing of a file's text contents */
 	gboolean	enable_thumbnails;
Index: src/trackerd/trackerd.c
===================================================================
--- src/trackerd/trackerd.c	(Revision 394)
+++ src/trackerd/trackerd.c	(Arbeitskopie)
@@ -2491,6 +2491,7 @@ set_defaults ()
 	tracker->use_nfs_safe_locking = FALSE;
 
 	tracker->enable_indexing = TRUE;
+	tracker->enable_hidden_file_indexing = TRUE;
 	tracker->enable_watching = TRUE;
 	tracker->enable_content_indexing = TRUE;
 	tracker->enable_thumbnails = FALSE;
@@ -2612,6 +2613,7 @@ sanity_check_option_values ()
 	tracker_log ("Low memory mode : \t\t\t%s", bools[!tracker->use_extra_memory]);
 	tracker_log ("Faster indexing : \t\t\t%s", bools[tracker->turbo]);
 	tracker_log ("Indexing enabled : \t\t\t%s", bools[tracker->enable_indexing]);
+	tracker_log ("Hidden File Indexing enabled : \t\t%s", bools[tracker->enable_hidden_file_indexing]);
 	tracker_log ("Watching enabled : \t\t\t%s", bools[tracker->enable_watching]);
 	tracker_log ("File content indexing enabled : \t%s", bools[tracker->enable_content_indexing]);
 	tracker_log ("Thumbnailing enabled : \t\t\t%s", bools[tracker->enable_thumbnails]);
Index: src/trackerd/trackerd.h
===================================================================
--- src/trackerd/trackerd.h	(Revision 394)
+++ src/trackerd/trackerd.h	(Arbeitskopie)
@@ -19,7 +19,7 @@
 
 #include <glib.h>
 #include "tracker-db.h"
-#include "tracker-global.h"
+//#include "tracker-global.h"