diff --git a/Makefile.am b/Makefile.am
index cc7b451..3f7d58a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,7 +35,7 @@ appman_PRE = \
 
 # App default files  (*.ad)
 
-appdefaultdir = @appdefaultdir@
+appdefaultdir = $(top_builddir)/@appdefaultdir@
 
 
 APPDEFAULTFILES = \
@@ -46,25 +46,22 @@ SUFFIXES = .ad 
 .ad:
 	cp $< $@
 
-appdefault_DATA = $(APPDEFAULTFILES)
-
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad) xload.bit
+dist_appdefault_DATA = $(APPDEFAULTFILES)
 
 CLEANFILES = $(APPDEFAULTFILES)
 
 
 appmandir = $(APP_MAN_DIR)
 
-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+dist_appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
 
-EXTRA_DIST += $(appman_PRE)
-CLEANFILES += $(appman_DATA)
+CLEANFILES += $(dist_appman_DATA)
 
 SED = sed
 
 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@
-  XORGMANNAME = X Version 11
+XORGMANNAME = X Version 11
 
 MAN_SUBSTS = \
 	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
