diff -urN data/Makefile.am data/Makefile.am
--- data/Makefile.am	2006-05-02 22:37:42.000000000 +0200
+++ data/Makefile.am	2006-08-07 03:29:24.000000000 +0200
@@ -2,13 +2,18 @@
 
 configdir = $(datadir)/tracker
 
-config_DATA = tracker-introspect.xml mysql-tracker.sql mysql-stored-procs.sql mysql-system.sql tracker.cfg tracker-stop-words.txt
+config_DATA =   tracker-introspect.xml \
+		mysql-tracker.sql \
+		mysql-stored-procs.sql \
+		mysql-system.sql \
+		tracker.cfg \
+		tracker-stop-words.txt
 
 servicedir       = $(prefix)/share/dbus-1/services
 service_in_files = tracker.service.in
 service_DATA     = tracker.service
 
+EXTRA_DIST = $(config_DATA) $(service_in_files)
+
 %.service: %.service.in
 	@sed -e "s|\ bindir\@|$(bindir)|" $< > $@
-
-
diff -urN filters/application/Makefile.am filters/application/Makefile.am
--- filters/application/Makefile.am	2005-12-14 12:11:13.000000000 +0100
+++ filters/application/Makefile.am	2006-08-07 03:02:59.000000000 +0200
@@ -9,7 +9,5 @@
 			vnd.sun.xml.calc_filter \
 			vnd.sun.xml.impress_filter \
 			vnd.sun.xml.writer_filter
-			
-
-
 
+EXTRA_DIST = $(thumbappbin_SCRIPTS)
diff -urN filters/text/Makefile.am filters/text/Makefile.am
--- filters/text/Makefile.am	2005-12-14 12:11:13.000000000 +0100
+++ filters/text/Makefile.am	2006-08-07 03:04:14.000000000 +0200
@@ -1,5 +1,5 @@
 filterbindir = $(datadir)/filters/text
 
-filterbin_SCRIPTS = 	html_filter
-
+filterbin_SCRIPTS = html_filter
 
+EXTRA_DIST = $(filterbin_SCRIPTS)
diff -urN Makefile.am Makefile.am
--- Makefile.am	2006-01-15 20:20:55.000000000 +0100
+++ Makefile.am	2006-08-07 02:56:34.000000000 +0200
@@ -4,7 +4,8 @@
 pkgconfig_DATA = tracker.pc
 
 EXTRA_DIST = \
+	$(pkgconfig_DATA) \
 	AUTHORS NEWS INSTALL COPYING README \
 	ChangeLog \
-	configure.in
-
+	configure.in \
+	rdf-query-examples/*.rdf
diff -urN src/Makefile.am src/Makefile.am
--- src/Makefile.am	2006-07-31 14:01:53.000000000 +0200
+++ src/Makefile.am	2006-08-07 02:54:49.000000000 +0200
@@ -5,6 +5,5 @@
 extractor_dir =
 endif
 
-SUBDIRS =text-filters trackerd  libtracker $(extractor_dir) tracker-extract 
-
-
+SUBDIRS = text-filters trackerd libtracker $(extractor_dir) tracker-extract 
+DIST_SUBDIRS = text-filters trackerd libtracker $(extractor_dir) tracker-extract
diff -urN src/trackerd/Makefile.am src/trackerd/Makefile.am
--- src/trackerd/Makefile.am	2006-07-31 14:02:03.000000000 +0200
+++ src/trackerd/Makefile.am	2006-08-07 03:42:55.000000000 +0200
@@ -13,6 +13,7 @@
 
 if HAVE_INOTIFY
 inotify_sources = \
+	linux-inotify-syscalls.h \
 	tracker-inotify.c	\
 	tracker-inotify.h	
 else
diff -urN src/tracker-extract/Makefile.am src/tracker-extract/Makefile.am
--- src/tracker-extract/Makefile.am	2006-07-31 14:01:59.000000000 +0200
+++ src/tracker-extract/Makefile.am	2006-08-07 03:58:51.000000000 +0200
@@ -11,5 +11,3 @@
 endif
 
 tracker_extract_LDADD = $(GLIB2_LIBS) $(extractor_ldadd)
-
-		
diff -urN src/tracker-extract/tracker-extract.c src/tracker-extract/tracker-extract.c
--- src/tracker-extract/tracker-extract.c	2006-05-15 00:33:27.000000000 +0200
+++ src/tracker-extract/tracker-extract.c	2006-08-07 03:59:45.000000000 +0200
@@ -22,7 +22,11 @@
 #include <string.h> 
 #include <unistd.h>
 #include <glib.h>
+#ifndef USING_INTERNAL_LIBEXTRACTOR
+#include <extractor.h>
+#else
 #include "../libextractor/src/include/extractor.h"
+#endif
 
 
 typedef enum {
diff -urN thumbnailers/application/Makefile.am thumbnailers/application/Makefile.am
--- thumbnailers/application/Makefile.am	2005-12-14 12:11:13.000000000 +0100
+++ thumbnailers/application/Makefile.am	2006-08-07 02:57:32.000000000 +0200
@@ -2,5 +2,4 @@
 
 thumbappbin_SCRIPTS = pdf_thumbnailer
 
-
-
+EXTRA_DIST = $(thumbappbin_SCRIPTS)