diff --git a/ChangeLog b/ChangeLog-old
similarity index 99%
rename from ChangeLog
rename to ChangeLog-old
index b266de64b379cb35b22606cbc0e074ef2da5e880..c3b41e2341775998d4018cd81989f7c18b4ca577 100644
--- a/ChangeLog
+++ b/ChangeLog-old
@@ -1207,7 +1207,7 @@ Fri Apr 24 13:17:47 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 	Fix network config in XM driver
 	* src/xm_internal.c: Fix setting of bridge & script parameters
 	in VIF config
-	* src/xend_internal.h, src/xend_internal.c: Export the 
+	* src/xend_internal.h, src/xend_internal.c: Export the
 	default bridge script name to XM driver
 	* tests/xmconfigdata/*: Update to take account of script=
 	setting in VIF config
diff --git a/Makefile.am b/Makefile.am
index c251f96d1f590215ef912cc881d0d9cffa9b3af0..f9efff580bd13041a39e808eaab085689098a72a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,6 +9,7 @@ SUBDIRS = gnulib/lib include src qemud tools proxy docs gnulib/tests \
 ACLOCAL_AMFLAGS = -I m4 -I gnulib/m4
 
 EXTRA_DIST = \
+  ChangeLog-old \
   libvirt.spec libvirt.spec.in \
   mingw32-libvirt.spec.in \
   libvirt.pc libvirt.pc.in \
@@ -49,3 +50,17 @@ clean-cov:
 
 # disable this check
 distuninstallcheck:
+
+dist-hook: gen-ChangeLog
+
+# Generate the ChangeLog file (with all entries since the switch to git)
+# and insert it into the directory we're about to use to create a tarball.
+gen_start_date = 2009-07-04
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+	if test -d .git; then					\
+	  $(top_srcdir)/build-aux/gitlog-to-changelog		\
+	    --since=$(gen_start_date) > $(distdir)/cl-t;	\
+	  rm -f $(distdir)/ChangeLog;				\
+	  mv $(distdir)/cl-t $(distdir)/ChangeLog;		\
+	fi
diff --git a/autogen.sh b/autogen.sh
index 788729faeac55b74de75102f3fae8f8e2dcc8918..c026112d215c1338fa79ebb37a0ecf1d6493d8c8 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -54,6 +54,9 @@ if test -z "$*"; then
         echo "to pass any to it, please specify them on the $0 command line."
 fi
 
+# Automake requires that ChangeLog exist.
+touch ChangeLog
+
 autopoint --force
 #rm -rf m4
 libtoolize --copy --force
diff --git a/bootstrap b/bootstrap
index b0de3dfa38577192d35692ce64f34aa4070ac9ea..0754d026d14f09be689261e734b102a6f8fc49b6 100755
--- a/bootstrap
+++ b/bootstrap
@@ -78,6 +78,7 @@ getaddrinfo
 gethostname
 getpass
 gettext
+gitlog-to-changelog
 gnumakefile
 inet_pton
 ioctl
diff --git a/build-aux/.gitignore b/build-aux/.gitignore
index af6c366af48713487ddbc7eedf1cfb4a4619a708..62188c1e91590b0195fb02968309a885af47843c 100644
--- a/build-aux/.gitignore
+++ b/build-aux/.gitignore
@@ -10,3 +10,4 @@ mkinstalldirs
 mktempd
 /useless-if-before-free
 /vc-list-files
+/gitlog-to-changelog