diff --git a/subversion.spec b/subversion.spec
index 297a8e1..8593516 100644
--- a/subversion.spec
+++ b/subversion.spec
@@ -2,22 +2,24 @@
 # set make_check to 0.
 %define make_check 1
 
+ExcludeArch: ppc64 s390 s390x ia64
+
 Summary: A Concurrent Versioning system similar to, but better than, CVS.
 Name: subversion
 Version: 0.32.1
-Release: 1
+Release: 2
 License: BSD
 Group: Development/Tools
 URL: http://subversion.tigris.org
 
-Source0: http://svn.collab.net/tarballs/subversion-%{version}.tar.gz
+Source0: http://subversion.tigris.org/tarballs/subversion-%{version}.tar.gz
 Source1: subversion.conf
 Source3: filter-requires.sh
 
 Patch1: subversion-0.24.2-swig.patch
 Patch2: subversion-0.20.1-deplibs.patch
 Patch3: subversion-0.31.0-rpath.patch
-Patch4: subversion-0.32.1-libtool.patch
+Patch5: subversion-0.32.1-CAN-2004-0397.patch
 
 BuildPreReq: autoconf, libtool, python, python-devel
 BuildPreReq: db4-devel >= 4.1.25, swig >= 1.3.15, docbook-style-xsl
@@ -51,7 +53,7 @@ package.
 %package -n mod_dav_svn
 Group: System Environment/Daemons
 Summary: Apache server module for Subversion server.
-Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn)
+Requires: httpd-mmn = %(cat %{_includedir}/httpd/.mmn || echo httpd-devel missing)
 Requires: subversion = %{version}-%{release}
 BuildPreReq: httpd-devel >= 2.0.45
 
@@ -65,15 +67,15 @@ using HTTP, via the Apache httpd server.
 %patch1 -p1 -b .swig
 %patch2 -p1 -b .deplibs
 %patch3 -p1 -b .rpath
+%patch5 -p0 -b .can0397
 
 rm -rf neon apr apr-util db4
 
 %build
 ./autogen.sh
 
-# libtool + db4 + ppc64 = confusion
-patch -p1 < %PATCH4
-autoconf
+# fix shebang lines, #111498
+perl -pi -e 's|/usr/bin/env perl -w|/usr/bin/perl -w|' tools/hook-scripts/*.pl.in
 
 %configure --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
 	--with-swig --with-neon=%{_prefix} \
@@ -140,6 +142,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_libdir}/httpd/modules/mod_authz_svn.so
 
 %changelog
+* Wed May 12 2004 Joe Orton <jorton@redhat.com> 0.32.1-2
+- add security fix for CVE CAN-2004-0397 (Ben Reser)
+
 * Fri Oct 24 2003 Joe Orton <jorton@redhat.com> 0.32.1-1
 - update to 0.31.2
 - work around libtool/ppc64/db4 confusion