diff --git a/.gitignore b/.gitignore
index 716a9b2cd..f6e7d18e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,7 +81,6 @@ Makefile.in
 /build-aux/test-driver
 /build-aux/ylwrap
 /bundled/ocaml-augeas/.depend
-/ChangeLog
 /compile
 /config.cache
 /config.guess
diff --git a/Makefile.am b/Makefile.am
index 9feac761b..743d2fbad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -215,15 +215,13 @@ maintainer-upload-website:
 # When doing 'make dist' update a few files automatically.
 #
 #  BUGS           - list of bugs (created from Bugzilla)
-#  ChangeLog      - changelog (created from git)
 #  docs/C_SOURCE_FILES
 #                 - source files scanned for internal documentation
 #  po/POTFILES    - files with ordinary extensions, but not OCaml files
 #  po/POTFILES-ml - OCaml files, which need a special tool to translate
 
-dist-hook: BUGS ChangeLog docs/C_SOURCE_FILES po/POTFILES po/POTFILES-ml
+dist-hook: BUGS docs/C_SOURCE_FILES po/POTFILES po/POTFILES-ml
 	cp BUGS $(distdir)/BUGS
-	cp ChangeLog $(distdir)/ChangeLog
 
 BUGS: configure.ac
 	rm -f $@ $@-t
@@ -231,11 +229,6 @@ BUGS: configure.ac
 	$(top_srcdir)/update-bugs.sh > $@-t
 	mv $@-t $@
 
-ChangeLog: configure.ac
-	rm -f $@ $@-t
-	git log --decorate=false > $@-t
-	mv $@-t $@
-
 # This has to be in the top-level Makefile.am so that we have access
 # to DIST_SUBDIRS.
 docs/C_SOURCE_FILES: configure.ac