diff --git a/data/Makefile.am b/data/Makefile.am
index 78f0eb5e..ab84629f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,20 +2,13 @@ SUBDIRS = \
 	icons \
 	html
 
-EXTRA_DIST = \
+dist_pixmaps_DATA = \
 	sparkleshare-gnome.svg \
 	sparkleshare-mist.svg \
 	sparkleshare-about.png \
 	side-splash.png
 
+pixmapsdir = $(pkgdatadir)/pixmaps/
+
 MAINTAINERCLEANFILES = \
 	Makefile.in
-
-install-data-local:
-	$(mkinstalldirs) $(pkgdatadir)/pixmaps
-	$(INSTALL_DATA) $(srcdir)/side-splash.png $(pkgdatadir)/pixmaps/side-splash.png
-	$(INSTALL_DATA) $(srcdir)/sparkleshare-about.png $(pkgdatadir)/pixmaps/sparkleshare-about.png
-	
-uninstall-hook:
-	rm -f $(pkgdatadir)/pixmaps/side-splash.png
-	rm -f $(pkgdatadir)/pixmaps/sparkleshare-about.png
diff --git a/data/html/Makefile.am b/data/html/Makefile.am
index 5b5629d9..cd4010b7 100644
--- a/data/html/Makefile.am
+++ b/data/html/Makefile.am
@@ -1,18 +1,9 @@
-EXTRA_DIST = \
+dist_htmlhelp_DATA = \
 	day-entry.html \
 	event-entry.html \
 	event-log.html
 
+htmlhelpdir = $(pkgdatadir)/html/
+
 MAINTAINERCLEANFILES = \
 	Makefile.in
-
-install-data-local:
-	$(mkinstalldirs) $(pkgdatadir)/html
-	$(INSTALL_DATA) $(srcdir)/day-entry.html $(pkgdatadir)/html/day-entry.html
-	$(INSTALL_DATA) $(srcdir)/event-entry.html $(pkgdatadir)/html/event-entry.html
-	$(INSTALL_DATA) $(srcdir)/event-log.html $(pkgdatadir)/html/event-log.html
-	
-uninstall-hook:
-	rm -f $(pkgdatadir)/html/day-entry.html
-	rm -f $(pkgdatadir)/html/event-entry.html
-	rm -f $(pkgdatadir)/html/event-log.html