--- abcde.orig	2008-08-16 19:16:37.000000000 +0200
+++ abcde	2008-09-30 11:18:18.000000000 +0200
@@ -1476,7 +1476,7 @@ do_cddbread ()
 			# 200 [section] [discid] [artist] / [title]
 			if checkstatus cddb-read-1-complete; then :; else
 				echo -n "Retrieving 1 CDDB match..." >> "$ABCDETEMPDIR/cddbchoices"
-				$CDDBTOOL read $CDDBURL $CDDBPROTO $CDDBUSER $CDDBHOST $(cut -f2,3 -d' ' "$ABCDETEMPDIR/cddbquery") > "$ABCDETEMPDIR/cddbread.1"
+				$CDDBTOOL read $CDDBURL $CDDBPROTO $CDDBUSER $CDDBHOST $(cut -f2,3 -d' ' "$ABCDETEMPDIR/cddbquery") | $ICONV $ICONVOPTS > "$ABCDETEMPDIR/cddbread.1"
 				echo "done." >> "$ABCDETEMPDIR/cddbchoices"
 				echo cddb-read-1-complete >> "$ABCDETEMPDIR/status"
 				echo cddb-choice=1 >> "$ABCDETEMPDIR/status"
@@ -1563,7 +1563,7 @@ do_cddbedit ()
 		CDDBDATA="$ABCDETEMPDIR/cddbread.$(checkstatus cddb-choice)"
 		CDDBDATATMP="$ABCDETEMPDIR/cddbread.tmp"
 		tr -d '\r' < $CDDBDATA > $CDDBDATATMP
-		mv $CDDBDATATMP $CDDBDATA
+		mv "$CDDBDATATMP" "$CDDBDATA"
 		VARIOUSARTISTS="$(checkstatus variousartists)"
 		VARIOUSARTISTSTYLE="$(checkstatus variousartiststyle)"
 		return 0
@@ -2122,6 +2122,7 @@ NORMALIZE=normalize
 CDSPEED=eject
 VORBISGAIN=vorbisgain
 MKCUE=mkcue
+ICONV=iconv
 
 # Options for programs called from abcde
 # mp3
@@ -2156,6 +2157,7 @@ CDSPEEDVALUE=
 MKCUEOPTS=
 VORBISCOMMENTOPTS="-R"
 METAFLACOPTS="--no-utf8-convert"
+ICONVOPTS="-f iso8859-1 -t utf-8"
 
 # Default to one process if -j isn't specified
 MAXPROCS=1