diff --git a/ChangeLog b/ChangeLog.1
similarity index 100%
rename from ChangeLog
rename to ChangeLog.1
diff --git a/Makefile.am b/Makefile.am
index 5df19417..a9d98892 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 
 ACLOCAL_AMFLAGS = -I am -I m4
 
-EXTRA_DIST = paths ChangeLog.0 summary.sh.in CHECKLIST
+EXTRA_DIST = paths ChangeLog.0 ChangeLog.1 summary.sh.in CHECKLIST
 
 SUBDIRS = lib \
 	libinetutils libtelnet libicmp libls \
@@ -36,8 +36,17 @@ EXTRA_DIST += $(top_srcdir)/.version
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
 	echo $(VERSION) > $@-t && mv $@-t $@
-dist-hook:
+dist-hook: gen-ChangeLog
 	echo $(VERSION) > $(distdir)/.tarball-version
 
 snapshot:
 	$(MAKE) dist distdir=$(PACKAGE)-`date +"%Y%m%d"`
+
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+	$(AM_V_GEN)if test -d .git; then				\
+		$(top_srcdir)/build-aux/gitlog-to-changelog		\
+			-- v2.0~.. > $(distdir)/cl-t &&			\
+		{ rm -f $(distdir)/ChangeLog &&				\
+		  mv $(distdir)/cl-t $(distdir)/ChangeLog; }		\
+	fi
diff --git a/NEWS b/NEWS
index 1f130945..264471b3 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ GNU inetutils NEWS -- history of user-visible changes.
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+* ChangeLog is now automatically generated from version controlled logs.
+
+Historical information is preserved as ChangeLog.0 and ChangeLog.1.
+
 * telnet
 
 ** Implement --bind (-b).
diff --git a/THANKS b/THANKS
index 301773f9..98d70d4c 100644
--- a/THANKS
+++ b/THANKS
@@ -10,7 +10,7 @@ In particular:
   Nathan Neulinger       (tftpd)
   Thomas Bushnell        (sockaddr sin_len field)
 
-Please see ChangeLog for full credits.
+Please see version control logs and ChangeLog.? for full credits.
 
 Email of contributors in alphabetical order:
 Alex Muntada	   <alexm@ac.upc.es>
diff --git a/bootstrap.conf b/bootstrap.conf
index 4e389678..6f480a88 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -61,6 +61,7 @@ getpass
 gettext-h
 getusershell
 git-version-gen
+gitlog-to-changelog
 glob
 inttostr
 ioctl
@@ -113,6 +114,12 @@ if [ -r .bootstrap ]; then
   eval set -- "`sed 's/#.*$//;/^$/d' .bootstrap | tr '\n' ' '` $*"
 fi
 
+bootstrap_post_import_hook ()
+{
+  # Automake requires that ChangeLog exist.
+  touch ChangeLog || return 1
+}
+
 bootstrap_epilogue() {
   perl -pi -e "s/\@PACKAGE\@/$package/g" README-release
   perl -pi -e "s/X.Y/X.Y.Z/g" README-release