--- abcde-2.5.4/abcde	2012-09-18 15:09:31.000000000 +0200
+++ abcde-2.5.4/abcde	2013-01-28 21:44:55.479715536 +0100
@@ -829,7 +829,7 @@
 						-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"
 					;;
@@ -3879,7 +3879,7 @@
 	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 ...