diff --git a/squid.spec b/squid.spec
index 0f23093..436632f 100644
--- a/squid.spec
+++ b/squid.spec
@@ -1,7 +1,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.3.STABLE4
-Release: 10
+Release: 10.7.1
 Serial: 6
 Copyright: GPL
 Group: System Environment/Daemons
@@ -23,6 +23,8 @@ Patch13: squid-2.3.stable4-ipfw_configure.patch
 Patch14: squid-2.3.stable4-accel_only_access.patch
 Patch15: squid-2.3.stable4-carp-assertion.patch
 Patch16: squid-2.3.stable4-html_quoting.patch
+Patch17: squid-2.3.stable4-snmp-community-null-pointer.patch
+Patch18: squid-2.4stable-ftpcrash.path
 BuildRoot: /var/tmp/squid-root
 Prereq: /sbin/chkconfig logrotate shadow-utils  /etc/init.d
 Requires: bash >= 2.0
@@ -59,6 +61,8 @@ cd ..
 %patch14 -p0 -b .accel_only
 %patch15 -p0 -b .carp
 %patch16 -p0 -b .html_quote
+%patch17 -p0 -b .snmp
+%patch18 -p0 -b .ftp-crash
 
 %build
 %configure \
@@ -258,20 +262,20 @@ fi
 
 %preun
 if [ $1 = 0 ] ; then
+	service squid stop >/dev/null 2>&1
 	rm -f /var/log/squid/*
 	/sbin/chkconfig --del squid
-	service squid stop >/dev/null 2>&1
 fi
 
 %postun
-if [ $1 = 0 ] ; then
-	userdel squid
-fi
 if [ "$1" -ge "1" ] ; then
 	service squid condrestart >/dev/null 2>&1
 fi
 
 %changelog
+* Mon Sep 24 2001 Bill Nottingham <notting@redhat.com>
+- add patches to fix SNMP assertion, FTP crash
+
 * Fri Mar  2 2001 Nalin Dahyabhai <nalin@redhat.com>
 - rebuild in new environment