--- abcde.orig	2002-05-26 19:29:44.000000000 -0700
+++ abcde	2002-05-26 19:43:14.000000000 -0700
@@ -319,6 +319,7 @@
 	ALBUMFILE=$(mungefilename "$DALBUM")
 	ARTISTFILE=$(mungefilename "$TRACKARTIST")
 	TRACKFILE=$(mungefilename "$TRACKNAME")
+	TRACKNUM=$(printf %0.${TRACKNUMPADDING}d ${UTRACKNUM})
 	# Supported variables for OUTPUTFORMAT are ALBUMFILE, ARTISTFILE, TRACKFILE, and TRACKNUM.
 	if [ "$VARIOUSARTISTS" = "y" ]; then
 		OUTPUTFILE=$(eval echo $VAOUTPUTFORMAT)
@@ -973,8 +974,8 @@
 fi
 
 # Load system defaults
-if [ -r /etc/abcde.conf ]; then
-	. /etc/abcde.conf
+if [ -r /etc/abcde/abcde.conf ]; then
+	. /etc/abcde/abcde.conf
 fi
 # Load user preference defaults
 if [ -r $HOME/.abcde.conf ]; then
--- Makefile.orig	2002-05-26 19:28:40.000000000 -0700
+++ Makefile	2002-05-26 19:29:09.000000000 -0700
@@ -1,12 +1,12 @@
 VERSION = 2.0.3
-INSTALL = /usr/bin/install -c
+INSTALL = /usr/bin/install -c
 
 # Installation directories
 prefix = ${DESTDIR}/usr
 exec_prefix = ${prefix}
 mandir = ${prefix}/share/man/man1
 bindir = ${exec_prefix}/bin
-etcdir = ${DESTDIR}/etc
+etcdir = ${DESTDIR}/etc/abcde
 
 all: