extras/cuetag.sh | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/extras/cuetag.sh b/extras/cuetag.sh

index 29ce38c..b475369 100755

--- a/extras/cuetag.sh

+++ b/extras/cuetag.sh

@@ -18,7 +18,7 @@ vorbis()

 {

 	# FLAC tagging

 	# --remove-vc-all overwrites existing comments

-	METAFLAC="metaflac --remove-vc-all --import-vc-from=-"

+	METAFLAC="metaflac --remove-all-tags --import-tags-from=-"

 	# Ogg Vorbis tagging

 	# -w overwrites existing comments

@@ -63,7 +63,7 @@ vorbis()

 	(for field in $fields; do

 		value=""

 		for conv in `eval echo \\$$field`; do

-			value=`$CUEPRINT -n $1 -t "$conv\n" $cue_file`

+			value=`$CUEPRINT -n "$1" -t "$conv\n" "$cue_file"`

 			if [ -n "$value" ]; then

 				echo "$field=$value"

@@ -138,10 +138,10 @@ main()

 		exit

 	fi

-	cue_file=$1

+	cue_file="$1"

 	shift

-	ntrack=`cueprint -d '%N' $cue_file`

+	ntrack=`cueprint -d '%N' "$cue_file"`

 	trackno=1

 	if [ $# -ne $ntrack ]; then