diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index beb380bc..f5d12106 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -69,22 +69,8 @@ clean.rpm:
 	rm -rf $(DIST_DIR) *.dist
 
 cpmod.dist:
-	for mod in $(SUBDIRS); do \
-		make -C $$mod distclean ;\
-		mkdir -p $(DIST_SRC_DIR)/$$mod ;\
-		tar -C $$mod \
-			--exclude=dist      \
-			--exclude=pckg      \
-			--exclude=Debug     \
-			--exclude=CVS       \
-			--exclude=old       \
-			--exclude=v1.1      \
-			--exclude='*.o'     \
-			--exclude='*~'      \
-			--exclude=xml-flat  \
-			--exclude=contrib   \
-		-cf - . |  tar -C $(DIST_SRC_DIR)/$$mod -xf - ;\
-	done
+	mkdir -p $(DIST_SRC_DIR)
+	$(cvs_files) | cpio -o -H newc | ( cd $(DIST_SRC_DIR); cpio --make-directories -i)
 	touch $@
 
 cpfiles.dist: