diff --git a/Makefile.am b/Makefile.am
index abe2e10..76d85da 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,13 +58,18 @@ distuninstallcheck_listfiles = 	\
         find -regex '.*/var/scrollkeeper/.*' -prune -or -type f -print
 
 # Build ChangeLog from GIT  history
-ChangeLog:
-	$(AM_V_GEN) if test -d $(top_srcdir)/.git; then \
-		GIT_DIR="$(top_srcdir)/.git" git log --stat > $@; \
+dist-hook:
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		( cd "$(top_srcdir)" && \
+		  echo '# Generated by Makefile. Do not edit.'; echo; \
+		  $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(distdir)/ChangeLog \
+		|| ( rm -f ChangeLog.tmp ; \
+			echo Failed to generate ChangeLog >&2 ); \
+	else \
+		echo A git clone is required to generate a ChangeLog >&2; \
 	fi
 
-dist: ChangeLog
-
-.PHONY: ChangeLog
-
 -include $(top_srcdir)/git.mk