2 files changed, 7 insertions, 47 deletions
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 7df260f..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,46 +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-03  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for X11R7 RC3 release.
-
-2005-12-02  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	* src/Makefile.am:
-	Add check and cflags for malloc(0) returning NULL.
-
-2005-11-19  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* xinerama.pc.in:
-	Update pkgconfig files to separate library build-time dependencies
-	from application build-time dependencies.
-
-2005-10-18  Kevin E. Martin  <kem-at-freedesktop-dot-org>
-
-	* configure.ac:
-	Update package version number for RC1 release.
-
-2005-07-08  Keith Packard  <keithp@keithp.com>
-
-	* .cvsignore:
-	* src/.cvsignore:
-	Add .cvsignore files
-	Switch _la_CFLAGS for AM_CFLAGS to clean up directory
-
-2005-06-21  Alexander Gottwald  <ago at freedesktop dot org>
-
-	* configure.ac
-	* src/Makefile.am
-	Add missing xext.pc and xextproto.pc
-	Add DEPS_CFLAGS to Makefile.am
-
diff --git a/Makefile.am b/Makefile.am
index 1d1b515..7642d24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -24,7 +24,13 @@ SUBDIRS = src man
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xinerama.pc
 
-EXTRA_DIST = xinerama.pc.in autogen.sh
+EXTRA_DIST = xinerama.pc.in autogen.sh ChangeLog
+MAINTAINERCLEANFILES = 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
 
 if LINT
 lint: