2 files changed, 10 insertions, 56 deletions
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index cbaa1b9..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,56 +0,0 @@
-2005-12-20  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version for X11R7 release.
-
-2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for final X11R7 release candidate.
-
-2005-12-06  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* helper/Makefile.am:
-	* plugin/Makefile.am:
-	Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
-
-2005-12-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
-
-2005-11-19  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update dependencies to work with separate build roots.
-
-2005-11-09  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for X11R7 RC2 release.
-
-2005-11-01  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update pkgcheck depedencies to work with separate build roots.
-
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for RC1 release.
-
-2005-10-11  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* xnest-plugin/Makefile.am:
-	Add XRX_CFLAGS to fix build
-
-2005-10-05  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* helper/Makefile.am:
-	* plugin/Makefile.am:
-	Install man pages
-
-2005-10-05  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* htdocs/Makefile.am:
-	Remove non-existant file
diff --git a/Makefile.am b/Makefile.am
index 57a65f3..461faad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,3 +20,13 @@
 #  PERFORMANCE OF THIS SOFTWARE.
 
 SUBDIRS = helper plugin libxplugin htdocs cgi-bin testplugin xnest-plugin rx
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog