diff --git a/Makefile.am b/Makefile.am
index b71d8b03..11c62fa1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,31 +4,62 @@ SUBDIRS = src data po doc
 
 gnome_calendardocdir = ${prefix}/doc/gnome_calendar
 gnome_calendardoc_DATA =        \
+  AUTHORS                       \
   README                        \
   INSTALL                       \
-  NEWS
-
+  NEWS                          \
+	ChangeLog
 
 INTLTOOL_FILES =                \
   intltool-extract.in           \
   intltool-merge.in             \
   intltool-update.in
 
-EXTRA_DIST =                    \
-  $(gnome_calendardoc_DATA)     \
-  $(INTLTOOL_FILES)             \
+EXTRA_DIST =                   \
+  $(gnome_calendardoc_DATA)  \
+  $(INTLTOOL_FILES)           \
   THANKS                        \
   TODO                          \
   autogen.sh
 
+CLEANFILES =                   \
+  AUTHORS
 
-DISTCLEANFILES =                \
+DISTCLEANFILES =              \
   intltool-extract              \
   intltool-merge                \
   intltool-update               \
   po/.intltool-merge-cache
 
-
 # Remove doc directory on uninstall
 uninstall-local:
 	-rm -r $(gnome_calendardocdir)
+
+AUTHORS:
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating $@ && \
+		( cd "$(top_srcdir)" && \
+		  echo '# Generated by Makefile. Do not edit.'; echo; \
+		  git log --no-merges --pretty=format:"%an" src \
+		  | sort | uniq ) > $@.tmp \
+		&& mv -f $@.tmp $@ \
+		|| ( rm -f $@.tmp ; \
+		     echo Failed to generate $@ >&2 ); \
+	fi
+
+dist-hook:
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		( cd "$(top_srcdir)" && \
+		  echo '# Generated by Makefile. Do not edit.'; echo; \
+		  git log --stat ) > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+		|| ( rm -f ChangeLog.tmp ; \
+		     echo Failed to generate ChangeLog >&2 ); \
+	else \
+		echo A git clone is required to generate a ChangeLog >&2; \
+	fi
+
+.PHONY: AUTHORS