diff --git a/Makefile.am b/Makefile.am
index f0965eb..0f29d2b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ appman_PRE = \
 
 # App default files  (*.ad)
 
-appdefaultdir = @appdefaultdir@
+appdefaultdir = $(top_builddir)/@appdefaultdir@
 
 
 APPDEFAULTFILES = \
@@ -42,26 +42,23 @@ SUFFIXES = .ad
 
 .ad:
 	cp $< $@
-
-appdefault_DATA = $(APPDEFAULTFILES)
-
-EXTRA_DIST = $(APPDEFAULTFILES:%=%.ad)
+	
+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)"|' \
@@ -81,9 +78,12 @@ SUFFIXES += .$(APP_MAN_SUFFIX) .man
 .man.$(APP_MAN_SUFFIX):
 	sed $(MAN_SUBSTS) < $< > $@
 
+
+if MAINTAINER_MODE
+
 .PHONY: ChangeLog
 
 ChangeLog:
-	GIT_DIR=${srcdir}/.git git-log --name-only > ChangeLog
+	git-log --name-only > ChangeLog
 
-dist-hook: ChangeLog
+endif
