diff --git a/Makefile.am b/Makefile.am
index af1e45a..f628444 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,4 +26,7 @@ topleveltags:
 	$(CTAGS) --format=1 -f - --languages=C --c-kinds=f --recurse=yes  server shared clients \
 	| perl -p -e 's/^([^\t]+)\t[^\t]+\/([^\t\/]+)\t(.*)$/$1\t$2\t$3/' > tags
 
+dist-hook:
+	rm -rf `find $(distdir)/contrib -name CVS`
+
 ## EOF