--- abcde-2.5.4.orig/cddb-tool	2012-06-20 09:44:13.000000000 -0400
+++ abcde-2.5.4/cddb-tool	2012-12-08 14:59:08.865171479 -0500
@@ -196,7 +196,7 @@
 	ADDRESS="$2"
 	DISCID=$(grep ^DISCID= "$FILE" | cut -f2 -d= | tr -d \[:cntrl:\])
 	CDDBGENRE=$(grep '^#CATEGORY=' "$FILE" | cut -f2- -d= | tr -d \[:cntrl:\])
-	grep -v "^#CATEGORY=" "$FILE" | iconv -t utf-8 | mail -a "Content-Type: text/plain; charset=utf-8" -s "cddb $CDDBGENRE $DISCID" "$ADDRESS"
+	grep -v "^#CATEGORY=" "$FILE" | iconv -t utf-8 | mailx -s "cddb $CDDBGENRE $DISCID" "$ADDRESS"
 	;;
 
 query) # cddb-tool query serverurl proto user host discid...