--- abcde-2.3.99.7.orig/abcde

+++ abcde-2.3.99.7/abcde

@@ -1116,9 +1116,10 @@

 					esac	

 					COMMENT="--comment \"$COMMENT\""

 				fi

-				# Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging

-				if [ ! "$DOTAG" = "y" ]; then

-					$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" "$COMMENT" "$IN" "$OUT"

+				# Tag the file at encode time, as it can't be done after encoding.

+				if [ "$DOTAG" = "y" ]; then

+					$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS --author "$TRACKARTIST" --title "$TRACKNAME" --comment "$COMMENT" "$IN" "$OUT"

+

 				else

 					$RUN_COMMAND nice $EFFECTIVE_NICE $SPEEXENCODER $SPEEXENCODEROPTS "$IN" "$OUT"

 				fi

@@ -1133,8 +1134,8 @@

 				$RUN_COMMAND nice $EFFECTIVE_NICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT"

 				;;

 			m4a)

-				# Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging

-				if [ ! "$DOTAG" = "y" ]; then

+				# Tag the file at encode time, as it can't be done after encoding.

+				if [ "$DOTAG" = "y" ]; then

 					$RUN_COMMAND nice $EFFECTIVE_NICE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" -o "$OUT" "$IN"

 				else