diff --git a/Makefile.am b/Makefile.am
index f700209d..3aecc4d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,6 @@ MAINTAINERCLEANFILES = \
     configure \
     install-sh \
     missing
- 
 
 pkgconfig_DATA	= lasso.pc
 pkgconfigdir	= $(libdir)/pkgconfig
@@ -25,6 +24,17 @@ clean-local:
 	-rm -f lasso.pc
 
 dist-hook:
-	-rm -rf `find $(distdir) -name .svn`
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		( cd "$(top_srcdir)" && \
+		  echo '# Generated by Makefile. Do not edit.'; echo; \
+		  $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(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
 
 DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc