diff -up abcde-2.5.4/abcde~ abcde-2.5.4/abcde
--- abcde-2.5.4/abcde~	2012-09-18 16:09:31.000000000 +0300
+++ abcde-2.5.4/abcde	2013-08-01 23:58:04.137972845 +0300
@@ -825,12 +825,12 @@ do_tag ()
 					# FIXME # track numbers in mp3 come with 1/10, so we cannot
 					# happily substitute them with $TRACKNUM
 					run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \
-						--comment=::"$COMMENTOUTPUT" -A "$DALBUM" \
+						--comment="$COMMENTOUTPUT" -A "$DALBUM" \
 						-a "$TRACKARTIST" -t "$TRACKNAME" -Y "$CDYEAR" \
 						-G "$GENREID" -n "${TRACKNUM:-$1}" \
 						${TRACKNUM:+-N "$TRACKS"} \
-						${ENCODING:+--set-encoding="$ENCODING"} \
-						${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
+						${ENCODING:+--encoding="$ENCODING"} \
+						${TPE2:+--text-frame=TPE2:"$TPE2"} \
 						"$ABCDETEMPDIR/track$1.$OUTPUT"
 					;;
 				# FIXME # Still not activated...
@@ -3879,7 +3879,7 @@ else
 	TAGGER="$EYED3"
 	TAGGEROPTS="$ID3V2OPTS"
 	ID3SYNTAX=eyed3
-	TAGGEROPTS="--set-encoding=utf16-LE $ID3V2OPTS"
+	TAGGEROPTS="--encoding=utf16 $ID3V2OPTS"
 fi
 
 # NOGAP is specific to lame. Other encoders fail ...