diff --git a/Makefile.am b/Makefile.am
index 2ab16cb11..921a1322a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,14 +5,16 @@ DIST_SUBDIRS = config src test etc
 EXTRA_DIST = lxc.spec
 
 ChangeLog::
-	touch ChangeLog
+	@touch ChangeLog
+
+dist-hook:
+	-@cvs2cl
+	@cp ChangeLog $(distdir)
 
 rpm: dist
 	rpmbuild --clean -ta ${distdir}.tar.gz
 
 release: rpm
-	@echo "Generating ChangeLog"
-	@cvs2cl
 	@sh ./release.sh $(PACKAGE_NAME) \
 			$(LXC_MAJOR_VERSION) \
 			$(LXC_MINOR_VERSION) \