diff --git a/amanda.spec b/amanda.spec
index d472942..4f26c30 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -2,6 +2,8 @@
 %{!?defconfig:%define defconfig DailySet1}
 %{!?indexserver:%define indexserver localhost}
 %{!?tapeserver:%define tapeserver %{indexserver}}
+%{!?amanda_user:%define amanda_user amanda}
+%{!?amanda_group:%define amanda_group disk}
 
 # XXX append lib to current _localstatedir setting
 %{expand: %%define	_localstatedir	%{_localstatedir}/lib}
@@ -9,11 +11,11 @@
 Summary: A network-capable tape backup solution.
 Name: amanda
 Version: 2.4.5p1
-Release: 2.1
+Release: 3
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 # Source2: __README_QUICKSETUP__
-Source3: amanda.conf
+#Source3: amanda.conf
 Source4: disklist
 Source5: amanda-xinetd
 Source6: amandaidx-xinetd
@@ -26,7 +28,7 @@ Group: Applications/System
 URL: http://www.amanda.org
 Prereq: fileutils grep initscripts
 BuildRequires: dump gnuplot cups samba-client tar grep fileutils
-BuildRequires: libtool automake autoconf gcc-c++
+BuildRequires: libtool automake autoconf gcc-c++ /usr/bin/Mail
 Requires: tar
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -99,9 +101,9 @@ export SED=sed
 	--with-gnutar-listdir=%{_localstatedir}/amanda/gnutar-lists \
 	--with-smbclient=%{_bindir}/smbclient \
 	--with-amandahosts \
-	--with-user=amanda \
-	--with-group=disk \
-        --with-tmpdir=/var/log/amanda \
+	--with-user=%amanda_user \
+	--with-group=%amanda_group \
+	--with-tmpdir=/var/log/amanda \
 	--with-gnutar=/bin/tar
 	
 make %{?_smp_mflags}
@@ -123,8 +125,8 @@ chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amandaidx
 perl -p -e "s,\@LIBDIR\@,%{_libexecdir},g" < %SOURCE7 > $RPM_BUILD_ROOT/etc/xinetd.d/amidxtape
 chmod 644 $RPM_BUILD_ROOT/etc/xinetd.d/amidxtape
 mkdir -p $RPM_BUILD_ROOT/var/log/amanda
-mkdir -p $RPM_BUILD_ROOT/var/lib/amanda
-install -m 660 %SOURCE8 $RPM_BUILD_ROOT/var/lib/amanda/.amandahosts
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/amanda
+install -m 660 %SOURCE8 $RPM_BUILD_ROOT%{_localstatedir}/amanda/.amandahosts
 
 mkdir -p examples
 cp example/* examples
@@ -139,14 +141,15 @@ popd
 # cp ${RPM_SOURCE_DIR}/__README_QUICKSETUP__ docs/
 
 pushd ${RPM_BUILD_ROOT}
-  mkdir -p .%{_sysconfdir}/amanda/DailySet1
+  mkdir -p .%{_sysconfdir}/amanda/%defconfig
   cp ${RPM_SOURCE_DIR}/amanda.crontab .%{_sysconfdir}/amanda/crontab.sample
-  cp ${RPM_SOURCE_DIR}/amanda.conf .%{_sysconfdir}/amanda/DailySet1
-  cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/DailySet1
+#  cp ${RPM_SOURCE_DIR}/amanda.conf .%{_sysconfdir}/amanda/%defconfig
+cp ${RPM_BUILD_DIR}/%{name}-%{version}/examples/amanda.conf .%{_sysconfdir}/amanda/%{defconfig}
+  cp ${RPM_SOURCE_DIR}/disklist .%{_sysconfdir}/amanda/%defconfig
   touch .%{_sysconfdir}/amandates
 
   mkdir -p .%{_localstatedir}/amanda/gnutar-lists
-  mkdir -p .%{_localstatedir}/amanda/DailySet1/index
+  mkdir -p .%{_localstatedir}/amanda/%defconfig/index
 
 #  for i in libamanda libamtape libamclient libamserver ; do
 #    mv .%{_libdir}/${i}.so .%{_libdir}/${i}-%{version}-19991216-beta1.so
@@ -162,8 +165,8 @@ rm -rf $RPM_BUILD_ROOT/usr/share/amanda
 rm -rf ${RPM_BUILD_ROOT}
 
 %pre
-useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \
-	-c "Amanda user" -u 33 amanda >/dev/null 2>&1 || :
+useradd -M -n -g %amanda_group -o -r -d %{_localstatedir}/amanda -s /bin/bash \
+	-c "Amanda user" -u 33 %amanda_user >/dev/null 2>&1 || :
 
 
 
@@ -191,14 +194,14 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \
 %defattr(-,root,root)
 %{_libdir}/libamanda*.so
 %{_libdir}/libamtape*.so
-%attr(-,amanda,disk)	%{_sbindir}/amrestore
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amrestore
 %{_mandir}/man8/amrestore.8*
-%attr(660,amanda,disk)  %config(noreplace) /var/lib/amanda/.amandahosts
+%attr(660,%amanda_user,%amanda_group)  %config(noreplace) %{_localstatedir}/amanda/.amandahosts
 
-%attr(02700,amanda,disk) %dir /var/log/amanda
-%attr(-,amanda,disk)	%dir %{_localstatedir}/amanda/
-%attr(-,amanda,disk)	%dir %{_sysconfdir}/amanda/
-%attr(-,amanda,disk)	%config(noreplace) %{_sysconfdir}/amandates
+%attr(02700,%amanda_user,%amanda_group) %dir /var/log/amanda
+%attr(-,%amanda_user,%amanda_group)	%dir %{_localstatedir}/amanda/
+%attr(-,%amanda_user,%amanda_group)	%dir %{_sysconfdir}/amanda/
+%attr(-,%amanda_user,%amanda_group)	%config(noreplace) %{_sysconfdir}/amandates
 
 %{_mandir}/man5/amanda.conf*
 
@@ -208,64 +211,64 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \
 %{_libdir}/libamserver*.so
 %config(noreplace) /etc/xinetd.d/amandaidx
 %config(noreplace) /etc/xinetd.d/amidxtape
-%attr(-,amanda,disk)    %dir %{_libexecdir}/
-%attr(-,amanda,disk)	%{_libexecdir}/amidxtaped
-%attr(-,amanda,disk)	%{_libexecdir}/amindexd
-%attr(-,amanda,disk)	%{_libexecdir}/amlogroll
-%attr(-,amanda,disk)	%{_libexecdir}/amtrmidx
-%attr(-,amanda,disk)	%{_libexecdir}/amtrmlog
-%attr(-,amanda,disk)	%{_libexecdir}/driver
-%attr(4750,root,disk)	%{_libexecdir}/dumper
-%attr(4750,root,disk)	%{_libexecdir}/planner
-%attr(-,amanda,disk)	%{_libexecdir}/taper
-%attr(-,amanda,disk)	%{_libexecdir}/amcleanupdisk
-%attr(-,amanda,disk)	%{_libexecdir}/chg-chio
-%attr(-,amanda,disk)	%{_libexecdir}/chg-chs
-%attr(-,amanda,disk)	%{_libexecdir}/chg-juke
-%attr(-,amanda,disk)	%{_libexecdir}/chg-manual
-%attr(-,amanda,disk)	%{_libexecdir}/chg-mcutil
-%attr(-,amanda,disk)	%{_libexecdir}/chg-mtx
-%attr(-,amanda,disk)	%{_libexecdir}/chg-multi
-%attr(-,amanda,disk)	%{_libexecdir}/chg-null
-%attr(-,amanda,disk)	%{_libexecdir}/chg-rait
-%attr(-,amanda,disk)	%{_libexecdir}/chg-rth
-%attr(-,amanda,disk)	%{_libexecdir}/chg-scsi
-%attr(-,amanda,disk)	%{_libexecdir}/chg-zd-mtx
-%attr(-,amanda,disk)	%{_libexecdir}/chg-disk
-%attr(-,amanda,disk)	%{_libexecdir}/chg-iomega
-%attr(-,amanda,disk)	%{_libexecdir}/amcat.awk
-%attr(-,amanda,disk)	%{_libexecdir}/amplot.awk
-%attr(-,amanda,disk)	%{_libexecdir}/amplot.g
-%attr(-,amanda,disk)	%{_libexecdir}/amplot.gp
-
-%attr(-,amanda,disk)	%{_sbindir}/amadmin
-%attr(4750,root,disk)	%{_sbindir}/amcheck
-%attr(-,amanda,disk)	%{_sbindir}/amflush
-%attr(-,amanda,disk)	%{_sbindir}/amgetconf
-%attr(-,amanda,disk)	%{_sbindir}/amlabel
-%attr(-,amanda,disk)	%{_sbindir}/amtape
-%attr(-,amanda,disk)	%{_sbindir}/amreport
-%attr(-,amanda,disk)	%{_sbindir}/amcheckdb
-%attr(-,amanda,disk)	%{_sbindir}/amcleanup
-%attr(-,amanda,disk)	%{_sbindir}/amdump
-%attr(-,amanda,disk)	%{_sbindir}/amoverview
-%attr(-,amanda,disk)	%{_sbindir}/amrmtape
-%attr(-,amanda,disk)	%{_sbindir}/amtoc
-%attr(-,amanda,disk)	%{_sbindir}/amverify
-%attr(-,amanda,disk)	%{_sbindir}/amstatus
-%attr(-,amanda,disk)	%{_sbindir}/amplot
-%attr(-,amanda,disk)	%{_sbindir}/amtapetype
-%attr(-,amanda,disk)	%{_sbindir}/amdd
-%attr(-,amanda,disk)	%{_sbindir}/ammt
-%attr(-,amanda,disk)	%{_sbindir}/amverifyrun
-
-%attr(-,amanda,disk)	%dir %{_localstatedir}/amanda/DailySet1/
-%attr(-,amanda,disk)	%dir %{_localstatedir}/amanda/DailySet1/index
-%attr(-,amanda,disk)	%dir %{_sysconfdir}/amanda
-%attr(-,amanda,disk)	%dir %{_sysconfdir}/amanda/DailySet1
-%attr(-,amanda,disk)	%config(noreplace) %{_sysconfdir}/amanda/DailySet1/amanda.conf
-%attr(-,amanda,disk)	%config(noreplace) %{_sysconfdir}/amanda/crontab.sample
-%attr(-,amanda,disk)	%config(noreplace) %{_sysconfdir}/amanda/DailySet1/disklist
+%attr(-,%amanda_user,%amanda_group)    %dir %{_libexecdir}/
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amidxtaped
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amindexd
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amlogroll
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amtrmidx
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amtrmlog
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/driver
+%attr(4750,root,%amanda_group)	%{_libexecdir}/dumper
+%attr(4750,root,%amanda_group)	%{_libexecdir}/planner
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/taper
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amcleanupdisk
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-chio
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-chs
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-juke
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-manual
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-mcutil
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-mtx
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-multi
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-null
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-rait
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-rth
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-scsi
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-zd-mtx
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-disk
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/chg-iomega
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amcat.awk
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amplot.awk
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amplot.g
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amplot.gp
+
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amadmin
+%attr(4750,root,%amanda_group)	%{_sbindir}/amcheck
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amflush
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amgetconf
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amlabel
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amtape
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amreport
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amcheckdb
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amcleanup
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amdump
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amoverview
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amrmtape
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amtoc
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amverify
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amstatus
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amplot
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amtapetype
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amdd
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/ammt
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amverifyrun
+
+%attr(-,%amanda_user,%amanda_group)	%dir %{_localstatedir}/amanda/%defconfig/
+%attr(-,%amanda_user,%amanda_group)	%dir %{_localstatedir}/amanda/%defconfig/index
+%attr(-,%amanda_user,%amanda_group)	%dir %{_sysconfdir}/amanda
+%attr(-,%amanda_user,%amanda_group)	%dir %{_sysconfdir}/amanda/%defconfig
+%attr(-,%amanda_user,%amanda_group)	%config(noreplace) %{_sysconfdir}/amanda/%defconfig/amanda.conf
+%attr(-,%amanda_user,%amanda_group)	%config(noreplace) %{_sysconfdir}/amanda/crontab.sample
+%attr(-,%amanda_user,%amanda_group)	%config(noreplace) %{_sysconfdir}/amanda/%defconfig/disklist
 
 %{_mandir}/man8/amadmin.8*
 %{_mandir}/man8/amanda.8*
@@ -290,25 +293,25 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \
 %{_mandir}/man8/amverifyrun.8*
 
 %files client
-%defattr(-,root,root)
-%config /etc/xinetd.d/amanda
-%{_libdir}/libamclient*.so
-%attr(-,amanda,disk)    %dir %{_libexecdir}/
-%attr(-,amanda,disk)	%{_libexecdir}/amandad
-%attr(4750,root,disk)	%{_libexecdir}/calcsize
-%attr(4750,root,disk)	%{_libexecdir}/killpgrp
-%attr(-,amanda,disk)	%{_libexecdir}/patch-system
-%attr(4750,root,disk)	%{_libexecdir}/rundump
-%attr(4750,root,disk)	%{_libexecdir}/runtar
-%attr(4750,root,disk)	%{_libexecdir}/amqde
-%attr(-,amanda,disk)	%{_libexecdir}/selfcheck
-%attr(-,amanda,disk)	%{_libexecdir}/sendbackup
-%attr(-,amanda,disk)	%{_libexecdir}/sendsize
-%attr(-,amanda,disk)	%{_libexecdir}/versionsuffix
-%attr(-,amanda,disk)	%{_sbindir}/amrecover
-			%{_mandir}/man8/amrecover.8*
-%attr(-,amanda,disk)	%{_sbindir}/security
-%attr(-,amanda,disk)	%{_localstatedir}/amanda/gnutar-lists/
+					%defattr(-,root,root)
+					%config /etc/xinetd.d/amanda
+					%{_libdir}/libamclient*.so
+%attr(-,%amanda_user,%amanda_group)	%dir %{_libexecdir}/
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/amandad
+%attr(4750,root,%amanda_group)		%{_libexecdir}/calcsize
+%attr(4750,root,%amanda_group)		%{_libexecdir}/killpgrp
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/patch-system
+%attr(4750,root,%amanda_group)		%{_libexecdir}/rundump
+%attr(4750,root,%amanda_group)		%{_libexecdir}/runtar
+%attr(4750,root,%amanda_group)		%{_libexecdir}/amqde
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/selfcheck
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/sendbackup
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/sendsize
+%attr(-,%amanda_user,%amanda_group)	%{_libexecdir}/versionsuffix
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/amrecover
+					%{_mandir}/man8/amrecover.8*
+%attr(-,%amanda_user,%amanda_group)	%{_sbindir}/security
+%attr(-,%amanda_user,%amanda_group)	%{_localstatedir}/amanda/gnutar-lists/
 
 %files devel
 %defattr(-,root,root)
@@ -319,6 +322,12 @@ useradd -M -n -g disk -o -r -d /var/lib/amanda -s /bin/bash \
 %{_libdir}/*.la
 
 %changelog
+* Wed Jan 18 2006 Jay Fenlason <fenlason@redhat.com> 2.4.5p1-3
+- Fix spec file to use %%{_localstatedir} instead of hardcoding /var/lib
+- Add amanda_user and amanda_group defines, to make changing the username
+  easier.
+- Add a BuildRequires on /usr/bin/Mail
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt