diff --git a/Makefile.am b/Makefile.am
index c185942..00d9605 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,29 @@
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = libgd src po data/icons data/geonames docs/reference/astrognome
 
-EXTRA_DIST = config.rpath m4/ChangeLog
+EXTRA_DIST = config.rpath ChangeLog
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
+
+MAINTAINERCLEANFILES = ChangeLog
+
+distclean-local:
+	if test "$(srcdir)" = "."; then :; else \
+	    rm -f ChangeLog; \
+	fi
+
+ChangeLog:
+	$(AM_V_GEN) if test -d "$(srcdir)/.git"; then \
+	    (GIT_DIR=$(top_srcdir)/.git ./missing --run git log -M -C --name-status --date=short --no-color) | fmt --split-only > $@.tmp \
+	    && mv -f $@.tmp $@ \
+	    || ($(RM) $@.tmp; \
+	        echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \
+	        (test -f $@ || echo git log is required to generate this file >> $@)); \
+	else \
+	    test -f $@ || \
+	    (echo A git checkout and git log is required to generate ChangeLog >&2 && \
+	    echo A git checkout and git log is required to generate this file >> $@); \
+	fi
+
+.PHONY: ChangeLog
+