diff --git a/scripts/pkg.sh b/scripts/pkg.sh
index f7f9585f..869b798c 100644
--- a/scripts/pkg.sh
+++ b/scripts/pkg.sh
@@ -90,7 +90,7 @@ scm_files()
 {
 	(
 		cd $TOPDIR
-		/bin/bash $JWB_SCRIPT_DIR/scm.sh ls-files -f $@
+		/bin/bash $JWB_SCRIPT_DIR/scm.sh ls-files -f "$@"
 	)
 }
 
@@ -401,6 +401,23 @@ cmd_version()
 
 build_pkg()
 {
+	local scm_files_opts=""
+
+	eval set -- `getopt -o a -l include-vcs-files -- "$@"`
+	while [ "$1" != -- ]; do
+	case $1 in
+		-a|--include-vcs-files)
+			scm_files_opts="$scm_files_opts -a"
+			;;
+		*)
+			echo -e "Unexpected argument >$1<\n" >&2
+			exit 1
+			;;
+	esac
+	shift
+	done
+	shift
+
 	set -e
 
 	local version=`read_map $TOPDIR/VERSION | sed 's/-dev//'`
@@ -425,7 +442,7 @@ build_pkg()
 	create_empty_dir $src_tree "Source files compilation directory"
 
 	# --- copy source files over
-	scm_files |
+	scm_files $scm_files_opts |
 		grep -v VERSION |
 		cpio -o -H newc |
 		( cd $src_tree; cpio -m --make-directories -i)
@@ -673,7 +690,7 @@ EOT
 
 cmd_build()
 {
-	build_pkg
+	build_pkg "$@"
 }
 
 cmd_upload()
@@ -1191,11 +1208,11 @@ version)
 build)
 	check_cwd
 	rm -rf ./$DIST_SRC_DIR ./$DIST_PCKG_DIR
-	cmd_build
+	cmd_build "$@"
 	;;
 release-reinstall)
 	check_update_version -c "Start version"
-	cmd_build
+	cmd_build "$@"
 	cmd_upload
 	;;
 release)
@@ -1206,7 +1223,7 @@ release)
 		check_cwd
 		rm -rf ./$DIST_SRC_DIR ./$DIST_PCKG_DIR
 		check_update_version || true
-		cmd_build
+		cmd_build "$@"
 		check_pkg_reinstall
 		cmd_upload
 	}
@@ -1234,4 +1251,3 @@ milk-install-log)
 esac
 
 goodbye
-