diff --git a/Makefile.am b/Makefile.am
index fb0598c46..d95383bbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -154,23 +154,30 @@ EXTRA_DIST += $(top_srcdir)/.version
 BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
 	echo $(VERSION) > $@-t && mv $@-t $@
-dist-hook: gen-ChangeLog
+dist-hook: gen-ChangeLogs
 	echo $(VERSION) > $(distdir)/.tarball-version
 
 # Generate ChangeLog.
 
 gen_start_date = 2015-10-13
-.PHONY: gen-ChangeLog
-gen-ChangeLog:
+.PHONY: gen-ChangeLogs
+gen-ChangeLogs:
 	$(AM_V_GEN)if test -d .git; then				\
 	  log_fix="$(srcdir)/build-aux/git-log-fix";			\
 	  test -e "$$log_fix"						\
 	    && amend_git_log="--amend=$$log_fix"			\
 	    || amend_git_log=;						\
-	  $(top_srcdir)/build-aux/gitlog-to-changelog			\
-	    $$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
-	    { rm -f $(distdir)/ChangeLog &&				\
-	      mv $(distdir)/cl-t $(distdir)/ChangeLog; }		\
+	  for d in . gettext-runtime/intl gettext-runtime/po		\
+		gettext-tools/po; do					\
+	    test "$$d" = "."						\
+	      && cldir="$(distdir)"					\
+	      || cldir="$(distdir)/$$d";				\
+	    $(top_srcdir)/build-aux/gitlog-to-changelog			\
+	      $$amend_git_log --since=$(gen_start_date) -- "$$d"	\
+		> "$$cldir/cl-t" &&					\
+	    { rm -f "$$cldir/ChangeLog" &&				\
+	      mv "$$cldir/cl-t" "$$cldir/ChangeLog"; };			\
+	  done;								\
 	fi
 
 # PO files update.
diff --git a/autogen.sh b/autogen.sh
index ca0468af5..3a301e461 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -417,7 +417,8 @@ fi
 
 # Automake requires that ChangeLog exist.
 for dir in . gettext-runtime gettext-runtime/libasprintf \
-           gettext-tools gettext-tools/examples; do
+           gettext-tools gettext-tools/examples \
+	   gettext-runtime/intl gettext-runtime/po gettext-tools/po; do
   cat > "$dir/ChangeLog" <<\EOF
 No more ChangeLog files
 ========================
@@ -426,10 +427,6 @@ October 14th, 2015 we put changelog information only in the git commit
 log, and generate a top-level ChangeLog file from logs at "make dist"
 time.
 
-This rule doesn't apply to the ChangeLog files under "intl" and "po"
-directories, because those files are distributed as part of gettext
-infrastructure files pulled with the autopoint program.
-
 Local Variables:
 buffer-read-only: t
 mode: text
diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog.0
similarity index 100%
rename from gettext-runtime/intl/ChangeLog
rename to gettext-runtime/intl/ChangeLog.0
diff --git a/gettext-runtime/po/ChangeLog b/gettext-runtime/po/ChangeLog.0
similarity index 100%
rename from gettext-runtime/po/ChangeLog
rename to gettext-runtime/po/ChangeLog.0
diff --git a/gettext-tools/po/ChangeLog b/gettext-tools/po/ChangeLog.1
similarity index 100%
rename from gettext-tools/po/ChangeLog
rename to gettext-tools/po/ChangeLog.1