diff --git a/.cvsignore b/.cvsignore
index f085180..c493109 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-netatalk-1.5.2.tar.gz
+netatalk-1.5.3.1.tar.bz2
diff --git a/atalk.init b/atalk.init
index af2b172..87751d2 100644
--- a/atalk.init
+++ b/atalk.init
@@ -31,7 +31,7 @@ start() {
 		    daemon papd -f /etc/atalk/papd.conf
 		fi
 		if [ ${AFPD_RUN} = yes ] ; then
-		    daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system
+		    daemon afpd -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}\" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system
 		fi
 	    } >/dev/null &
 	else
@@ -42,7 +42,7 @@ start() {
 		daemon papd -f /etc/atalk/papd.conf
 	    fi
 	    if [ ${AFPD_RUN} = yes ] ; then
-		daemon afpd -c ${AFPD_MAX_CLIENTS} -n ${ATALK_NAME} -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system
+		daemon afpd -c ${AFPD_MAX_CLIENTS} -n \"${ATALK_NAME}\" -f /etc/atalk/AppleVolumes.default -s /etc/atalk/AppleVolumes.system
 	    fi
 	fi
 	echo
diff --git a/netatalk.spec b/netatalk.spec
index e424d31..1df7c65 100644
--- a/netatalk.spec
+++ b/netatalk.spec
@@ -2,15 +2,16 @@
 
 Summary: AppleTalk networking programs
 Name: netatalk
-Version: 1.5.2
+Version: 1.5.3.1
 Release: 3
 License: GPL
 Group: System Environment/Daemons
-Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.gz
+Source0: http://download.sourceforge.net/netatalk/netatalk-%{version}.tar.bz2
 Source1: atalk.init
 Source2: netatalk.config
 Source3: AppleVolumes.system
 Source4: ICDumpSuffixMap
+Patch0: netatalk-1.5.3.1-norc.patch
 Epoch: 2
 Obsoletes: netatalk-1.4b2+asun
 Url: http://netatalk.sourceforge.net/
@@ -34,11 +35,13 @@ Appletalk networking programs.
 
 %prep
 %setup -q
+%patch0 -p 1 -b .norc
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fsigned-char" ./configure --prefix=%{_prefix} \
-	--with-cracklib --with-pam --with-shadow --with-tcp-wrappers \
-	--with-ssl --with-flock-locksi --with-uams-path=%{_libdir}
+	--with-pkgconfdir=/etc/atalk/ --with-cracklib --with-pam \
+	--with-shadow --with-tcp-wrappers --with-ssl --with-flock-locksi \
+	--with-uams-path=%{_libdir}
            
 make all
 
@@ -115,7 +118,20 @@ fi
 %{_datadir}/aclocal/netatalk.m4
 
 %changelog
-* Wed Apr 10 2002 Phil Knirsch <pknirsch@redhat.com>
+* Tue Jun 25 2002 Phil Knirsch <pknirsch@redhat.com> 1.5.3.1-3
+- Fixed dependancy problem on /usr/bin/rc by removing acleandir.[1|rc]
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 1.5.3.1-2
+- automated rebuild
+
+* Tue Jun 18 2002 Phil Knirsch <pknirsch@redhat.com> 1.5.3.1-1
+- Updated to latest version 1.5.3.1.
+- Fixed bug for nls file lookup (#66300).
+
+* Mon May 27 2002 Phil Knirsch <pknirsch@redhat.com> 1.5.2-4
+- Fixed initscript bug where you can't use blanks inside of names (#64926).
+
+* Wed Apr 10 2002 Phil Knirsch <pknirsch@redhat.com> 1.5.2-3
 - Fixed initscript to use correct config files from /etc/atalk (#62803)
 - Changed initscript to use $0 instead of direct string (#61734)
 - Change Copyright to Licencse and switch from BSD to GPL (#61746)
diff --git a/sources b/sources
index 7971316..83f96e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9355653d6b2c18f10d1be02624db65f6  netatalk-1.5.2.tar.gz
+7d9fe0fce60bccb1264fdbb42fa1465b  netatalk-1.5.3.1.tar.bz2