diff --git a/doc/Makefile.am b/doc/Makefile.am
index eca5a55..cec83db 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,6 @@
 
 man_MANS = tomb.1 tomb-open.1 tomb-status.1
 
-EXTRA_DIST = Luks_on_disk_format.pdf New_methods_in_HD_encryption.pdf TKS1-draft.pdf
+EXTRA_DIST = tomb.1 tomb-open.1 tomb-status.1 Luks_on_disk_format.pdf	\
+             New_methods_in_HD_encryption.pdf TKS1-draft.pdf
 
diff --git a/share/Makefile.am b/share/Makefile.am
index 2405dc4..f6066a4 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -1,3 +1,7 @@
+
+EXTRA_DIST = tomb.desktop tomb.applications tomb.keys tomb.mime tomb	\
+             monmort.png gtkrc.in tomb.mimepkg dyne-tomb.xml
+
 Applicationsdir = $(DESTDIR)/$(datadir)/applications
 Applications_DATA = tomb.desktop
 
@@ -20,7 +24,8 @@ AppInstDeskdir = $(DESTDIR)/$(datadir)/app-install/desktop
 AppInstDesk_DATA = tomb.desktop
 
 gtkrc:
-	sed -e 's@\%prefix\%@'"$(datadir)"'@' gtkrc.in > gtkrc
+	sed -e 's@\%prefix\%@'"$(datadir)"'@' $(top_srcdir)/share/gtkrc.in > \
+					      $(top_builddir)/share/gtkrc
 
 GtkRcdir = $(DESTDIR)/$(datadir)/themes/tomb/gtk-2.0-key
 GtkRc_DATA = gtkrc
@@ -30,13 +35,21 @@ MimePkg = tomb.mimepkg
 
 install-data-hook:
 	@echo "installing mime type"
-	@install -D dyne-tomb.xml $(DESTDIR)/$(datadir)/mime/packages
+	@install -D $(top_srcdir)/share/dyne-tomb.xml $(DESTDIR)/$(datadir)/mime/packages
 	@if ! [ -n `which xdg-mime` ]; then xdg-mime install dyne-tomb.xml; fi
 	@echo "installing icons";
-	@install -D monmort.png $(DESTDIR)/$(datadir)/pixmaps
+	@install -D $(top_srcdir)/share/monmort.png $(DESTDIR)/$(datadir)/pixmaps
 	@if ! [ -n `which xdg-icon-resource` ]; then \
-		xdg-icon-resource install --context mimetypes --size 32 ../src/monmort.xpm monmort; \
-		xdg-icon-resource install --size 32 ../src/monmort.xpm dyne-monmort; fi
+		xdg-icon-resource install --context mimetypes --size 32 \
+			$(top_srcdir)/src/monmort.xpm monmort; \
+		xdg-icon-resource install --size 32 $(top_srcdir)/src/monmort.xpm monmort; fi
 	@if ! [ -n `which update-desktop-database` ]; then echo update-desktop-database; update-desktop-database; fi
 	@if ! [ -n `which update-menus` ]; then echo update-menus;  update-menus; fi
 	@if ! [ -n `which update-mime` ]; then echo update-mime; update-mime; fi
+
+uninstall-hook:
+	unlink $(DESTDIR)/$(datadir)/pixmaps/monmort.png
+
+distclean:
+	unlink gtkrc
+	unlink Makefile
\ No newline at end of file
diff --git a/src/Makefile.am b/src/Makefile.am
index e2787b6..6b093ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,6 +7,6 @@ tomb_status_SOURCES = tomb-status.c
 tomb_status_LDADD = @GTK2_LIBS@ @NOTIFY_LIBS@
 tomb_status_CFLAGS = @GTK2_CFLAGS@ @NOTIFY_CFLAGS@
 
-EXTRA_DIST = monmort.xpm
+EXTRA_DIST = monmort.xpm tomb tomb-open
 pixmapdir = $(datadir)/pixmaps
 pixmap_DATA = monmort.xpm