diff --git a/.gitignore b/.gitignore
index 4fd20b4..7bc03f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .dirstamp
 Build
+ChangeLog
 MYMETA.json
 MYMETA.yml
 Makefile
diff --git a/Makefile.am b/Makefile.am
index 3e4415c..9da7140 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,10 @@
 dist_bin_SCRIPTS = bin/stow bin/chkstow
 info_TEXINFOS = doc/stow.texi
 dist_man_MANS = doc/stow.8
-dist_doc_DATA = README doc/manual.html doc/manual.pdf
+dist_doc_DATA = \
+	README \
+	doc/manual.html doc/manual.pdf \
+	ChangeLog doc/ChangeLog.OLD
 
 # Would be nice to include the split page HTML version of the manual
 # in the distribution, but automake doesn't support wildcards and I'm
@@ -133,3 +136,17 @@ doc/stow.8: bin/stow Makefile
 	[ -d doc ] || mkdir doc # required in vpath mode
 	pod2man $< > $@
 
+
+ChangeLog: doc/ChangeLog.OLD Makefile
+	@if [ -d .git ]; then \
+	    ( \
+	        git log \
+		    --format="format:%ad  %aN <%aE>%n%n    * %w(70,0,4)%s%+b%n" \
+		    --name-status \
+		    v2.0.2..HEAD \
+                | sed 's/^\([A-Z]\)\t/      \1 /'; \
+	        cat $< \
+	    ) > $@; \
+	else \
+	    echo "Not in a git repository; can't update ChangeLog."; \
+	fi
diff --git a/ChangeLog b/doc/ChangeLog.OLD
similarity index 99%
rename from ChangeLog
rename to doc/ChangeLog.OLD
index 636c7d4..ba07eb7 100644
--- a/ChangeLog
+++ b/doc/ChangeLog.OLD
@@ -1,4 +1,4 @@
-2008-01-31  Kahlil Hodgson  <kal@grebo.cs.rmit.edu.au>
+Thu Jan 31 2008  Kahlil Hodgson  <kal@grebo.cs.rmit.edu.au>
 
 	* stow.texi: Austin Wood and Chris Hoobin clean this up for version 2.