diff --git a/make/rpmdist.mk b/make/rpmdist.mk
index c2feba15..713398fc 100644
--- a/make/rpmdist.mk
+++ b/make/rpmdist.mk
@@ -21,9 +21,9 @@ LAST_RPM_VERSION         ?= $(shell $(PKG_SH_EXE) version \
 	-p $(OS)/$(RPM_ARCH) $(LAST_RPM_VERSION_FILE) read | $(SED) 's/-dev//')
 RPMBUILD                 ?= pkgbuild
 CHECK_CVS_SYNC_BEFORE_RPM_RELEASE ?= true
-HASH                      = $(shell $(cvs_files) | \
-	grep -v "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \
-	xargs md5sum | md5sum | $(SED) 's/ .*//')
+HASH                      = $(shell $(cvs_files) -z | \
+	grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \
+	xargs -0 md5sum | md5sum | $(SED) 's/ .*//')
 LOCAL_REPO               ?= /srv/ftp/pub/local/packages/suse/11.4
 
 include $(MODDIR)/make/tag-defs.mk
diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index 277349e6..6c3ee378 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -90,7 +90,7 @@ scm_files()
 {
 	(
 		cd $TOPDIR
-		/bin/bash $MOD_SCRIPT_DIR/list-cvs-files.sh -f
+		/bin/bash $MOD_SCRIPT_DIR/list-cvs-files.sh -f $@
 	)
 }
 
@@ -98,9 +98,9 @@ calculate_hash()
 {
 	(
 		cd $TOPDIR
-		scm_files | \
-			grep -v "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \
-			xargs md5sum | md5sum | sed 's/ .*//'
+		scm_files -z | \
+			grep -vz "CHANGES\|VERSION\|HASH\|MD5SUMS\|_RPM_RUN" | \
+			xargs -0 md5sum | md5sum | sed 's/ .*//'
 	)
 }