diff --git a/ChangeLog-2014-12-10 b/ChangeLog-2014-12-10
index 5e0597ba..a48a8687 100644
--- a/ChangeLog-2014-12-10
+++ b/ChangeLog-2014-12-10
@@ -1,9 +1,3 @@
-2014-40-22  Tim Ruehsen <tim.ruehsen@gmx.de>
-
-	* tests/Test-204.px: added file
-	* tests/run-px: added Test-204.px
-	* tests/Makefile.am: added Test-204.px
-
 2014-12-11  Tim Ruehsen <tim.ruehsen@gmx.de>
 
 	* src/Makefile.am: Support older versions of flex
@@ -1308,6 +1302,11 @@
 
 	* src/http.c (gethttp): Fix 204 response handling
 
+	* tests/Test-204.px: added file
+	* tests/run-px: added Test-204.px
+	* tests/Makefile.am: added Test-204.px
+
+
 2014-04-22  Giuseppe Scrivano  <gscrivan@redhat.com>
 
 	* tests/Makefile.am (EXTRA_DIST): Add missing Test--start-pos.px,
diff --git a/Makefile.am b/Makefile.am
index ab69f418..830d06b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ ACLOCAL_AMFLAGS = -I m4
 # subdirectories in the distribution
 SUBDIRS = lib src doc po tests util testenv
 
-EXTRA_DIST = ChangeLog-2014-12-10 MAILING-LIST \
+EXTRA_DIST = MAILING-LIST \
              msdos/config.h msdos/Makefile.DJ \
              msdos/Makefile.WC ABOUT-NLS \
              build-aux/build_info.pl build-aux/git-version-gen .version
@@ -60,5 +60,20 @@ clean-generic:
 
 # Arrange so that .tarball-version appears only in the distribution
 # tarball, and never in a checked-out repository.
-dist-hook:
+dist-hook: gen-ChangeLog
 	$(AM_V_GEN)echo $(VERSION) > $(distdir)/.tarball-version
+
+gen_start_date = 2014-12-10
+.PHONY: gen-ChangeLog
+gen-ChangeLog:
+	$(AM_V_GEN)if test -d .git; then				\
+	  log_fix="$(srcdir)/build-aux/git-log-fix";			\
+	  test -e "$$log_fix"						\
+	    || amend_git_log=;						\
+	  $(top_srcdir)/build-aux/gitlog-to-changelog			\
+	    $$amend_git_log --since=$(gen_start_date) > $(distdir)/cl-t && \
+            echo >>  $(distdir)/cl-t &&                                 \
+            cat ChangeLog-2014-12-10 >>  $(distdir)/cl-t &&             \
+	    { rm -f $(distdir)/ChangeLog &&				\
+	      mv $(distdir)/cl-t $(distdir)/ChangeLog; }		\
+	fi
diff --git a/bootstrap.conf b/bootstrap.conf
index 8d454757..40d9e670 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -47,6 +47,7 @@ getopt-gnu
 getpass-gnu
 getpeername
 getsockname
+gitlog-to-changelog
 git-version-gen
 gnupload
 ioctl