diff -ruN abcde-2.7.1-orig/abcde abcde-2.7.1/abcde
--- abcde-2.7.1-orig/abcde	2015-10-04 04:30:28.000000000 -0500
+++ abcde-2.7.1/abcde	2016-03-08 22:34:39.000000000 -0600
@@ -3459,10 +3459,9 @@
 NORMALIZERSYNTAX=default
 CUEREADERSYNTAX=default
 
-OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
-# Use the following VAOUTPUTFORMAT to revert to 2.0.x VA format:
-#VAOUTPUTFORMAT=${OUTPUTFORMAT}
-VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
+# These output formats are similar to iTunes
+OUTPUTFORMAT='${ARTISTFILE}/${ALBUMFILE}/$TRACKNUM ${TRACKFILE}'
+VAOUTPUTFORMAT=${OUTPUTFORMAT}
 ONETRACKOUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}'
 VAONETRACKOUTPUTFORMAT='Various-${ALBUMFILE}/${ALBUMFILE}'
 PLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}.m3u'
@@ -3708,7 +3707,7 @@
 GREP_COLOR=""
 
 if [ -z "$OUTPUTDIR" ]; then
-	OUTPUTDIR=$(pwd)
+	OUTPUTDIR="$HOME/Music"
 fi
 
 if [ -z "$WAVOUTPUTDIR" ]; then
@@ -3716,8 +3715,8 @@
 fi
 
 # Load system defaults
-if [ -r /etc/abcde.conf ]; then
-	. /etc/abcde.conf
+if [ -r @PREFIX@/etc/abcde.conf ]; then
+	. @PREFIX@/etc/abcde.conf
 fi
 # Load user preference defaults
 if [ -r $HOME/.abcde.conf ]; then
diff -ruN abcde-2.7.1-orig/abcde.conf abcde-2.7.1/abcde.conf
--- abcde-2.7.1-orig/abcde.conf	2015-10-04 04:30:28.000000000 -0500
+++ abcde-2.7.1/abcde.conf	2016-03-08 22:32:39.000000000 -0600
@@ -91,7 +91,7 @@
 # CD reader program to use - currently recognized options are 'cdparanoia',
 # 'libcdio' (cd-paranoia),'icedax', 'cdda2wav', 'dagrab', 'pird',
 # 'cddafs' (Mac OS X only) and 'flac'.
-#CDROMREADERSYNTAX=cdparanoia
+#CDROMREADERSYNTAX=cddafs
 
 # CUE reader syntax for the CUE reader program to use.
 # abcde supports 2 CUE modes: 'mkcue' and 'abcde.mkcue' so you can set the
@@ -202,11 +202,11 @@
 # If HTTPGET is modified, the HTTPGETOPTS options should also be defined
 # accordingly. If HTTPGET is changed, the default options will be set,
 # if HTTPGETOPTS is empty or not defined.
-#HTTPGET=wget
+#HTTPGET=curl
 # for fetch (FreeBSD): HTTPGETOPTS="-q -o -"
 # for wget: HTTPGETOPTS="-q -nv -O -"
 # for curl (MacOSX): HTTPGETOPTS="-f -s"
-#HTTPGETOPTS="-q -O -"
+#HTTPGETOPTS="-f -s"
 
 # MP3:
 # For the best LAME encoder options have a look at:
@@ -360,14 +360,14 @@
 # CD device you want to read from
 # It can be defined as a singletrack flac file, but since it might change from
 # file to file it makes little sense to define it here.
-#CDROM=/dev/cdrom
+#CDROM=/dev/disk1
 # If we are using the IDE bus, we need CDPARANOIACDROMBUS defined as "d"
 # If we are using the ide-scsi emulation layer, we need to define a "g"
 #CDPARANOIACDROMBUS="d"
 
 # If you'd like to make a default location that overrides the current
 # directory for putting mp3's, uncomment this.
-#OUTPUTDIR=`pwd`
+#OUTPUTDIR=$HOME/Music
 
 # Or if you'd just like to put the temporary .wav files somewhere else
 # you can specify that here
@@ -389,10 +389,10 @@
 # Since multiple-output was integrated we always append the file type
 # to the files. Remove it from your user defined string if you are getting
 # files like ".ogg.ogg".
-#OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
+#OUTPUTFORMAT='${ARTISTFILE}/${ALBUMFILE}/$TRACKNUM ${TRACKFILE}'
 
 # Like OUTPUTFORMAT but for Various Artists discs.
-#VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
+#VAOUTPUTFORMAT=${OUTPUTFORMAT}
 
 # Like OUTPUTFORMAT and VAOUTPUTFORMAT but for the ONEFILE rips.
 #ONETRACKOUTPUTFORMAT=$OUTPUTFORMAT