diff --git a/tcpdump.spec b/tcpdump.spec
index 6cb4c3b..7af07a1 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -7,10 +7,13 @@ Name: tcpdump
 Version: 3.6.2
 %define	tcpdump_dir	tcpdump-3.6.2
 %define tcpslice_dir	tcpslice
-Release: 9
+Release: 10.7x
+
 # XXX epoch is necessary to obsolete tcpdump-3.4a5
-Epoch: 12
-Copyright: BSD
+Epoch: 13
+
+License: BSD
+URL: http://www.tcpdump.org
 Group: Applications/Internet
 Source0: http://www.tcpdump.org/release/tcpdump-3.6.2.tar.gz
 Source1: http://www.tcpdump.org/release/libpcap-0.6.2.tar.gz
@@ -29,6 +32,7 @@ Patch9: tcpdump-3.6.1-smb-quiet.patch
 Patch10: tcpdump-3.6.1-portnumbers.patch
 Patch11: tcpdump-3.6.1-non-promisc-default.patch
 Patch12: tcpdump-3.6.2-afsprinting.patch
+Patch13: tcpdump-3.6.2-dropdefault.patch
 
 Patch34: arpwatch-2.1a4-fhs.patch
 Patch35: arpwatch-2.1a10-man.patch
@@ -36,7 +40,7 @@ Patch38: arpwatch-drop.patch
 Patch39: arpwatch-drop-man.patch
 
 Patch50: libpcap-shared.patch
-Patch51: libpcap-filter.patch
+Patch51: tcpdump-3.6.2-purge.patch
 
 
 Prefix: %{_prefix}
@@ -55,6 +59,8 @@ Version: 0.6.2
 %define	libpcap_dir	libpcap-0.6.2
 Summary: A system-independent interface for user-level packet capture.
 Group: Development/Libraries
+License: BSD
+URL: http://www.tcpdump.org
 Requires: kernel >= 2.2.0 openssl
 
 %description -n libpcap
@@ -74,6 +80,8 @@ Version: 2.1a11
 %define	arpwatch_dir	arpwatch-2.1a11
 Summary: Network monitoring tools for tracking IP addresses on a network.
 Group: Applications/System
+License: BSD
+URL: http://www.tcpdump.org
 Prereq: /sbin/chkconfig /sbin/service
 
 %description -n arpwatch
@@ -94,7 +102,7 @@ network.
 
 pushd %libpcap_dir
 %patch50 -p1 -b .shared 
-%patch51 -p1 -b .filter
+%patch51 -p1 -b .purge
 popd
 
 pushd %tcpdump_dir
@@ -104,6 +112,7 @@ pushd %tcpdump_dir
 %patch10 -p1 -b .portnumbers
 #%patch11 -p1 -b .nonpromisc		# Not by default
 %patch12 -p1 -b .afsprinting
+%patch13 -p1 -b .dropdefault
 popd
 
 pushd %arpwatch_dir
@@ -138,7 +147,7 @@ popd
 pushd %tcpdump_dir
 %define	optflags $RPM_OPT_FLAGS -DIP_MAX_MEMBERSHIPS=20
 autoconf
-%configure --enable-ipv6
+%configure --enable-ipv6 --with-user=pcap
 %undefine optflags
 
 DEFS="-g -DHAVE_CONFIG_H"
@@ -204,27 +213,30 @@ popd
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%pre
+/usr/sbin/groupadd -g %{PCAP_GID} pcap  2> /dev/null || :
+/usr/sbin/useradd -u %{PCAP_UID} -g %{PCAP_GID} \
+        -s /sbin/nologin -M -r -d %{_vararpwatch} pcap 2> /dev/null || ( /usr/bin/chsh pcap /sbin/nologin 2> /dev/null || : )
+
 %post -n arpwatch
 /sbin/chkconfig --add arpwatch
 
 %pre -n arpwatch
 /usr/sbin/groupadd -g %{PCAP_GID} pcap  2> /dev/null || :  
 /usr/sbin/useradd -u %{PCAP_UID} -g %{PCAP_GID} \
-        -s /bin/nologin -M -r -d %{_vararpwatch} pcap 2> /dev/null || :
+        -s /sbin/nologin -M -r -d %{_vararpwatch} pcap 2> /dev/null || ( /usr/bin/chsh pcap /sbin/nologin 2> /dev/null || : )
 
 %postun -n arpwatch
-if [ "$1" -ge "1" ]; then
-  /sbin/service arpwatch condrestart >/dev/null 2>&1
-fi
+/sbin/service arpwatch condrestart >/dev/null 2>&1 || :
 
 %preun -n arpwatch
-if [ $1 = 0 ]; then
-	/sbin/service arpwatch stop > /dev/null 2>&1
+if [ "$1" = "0" ]; then
+	/sbin/service arpwatch stop > /dev/null 2>&1 || :
 	/sbin/chkconfig --del arpwatch
 fi
 
 %post -n libpcap -p /sbin/ldconfig
- 
+
 %postun -n libpcap -p /sbin/ldconfig
 
 %files
@@ -263,6 +275,13 @@ fi
 %{_vararpwatch}/massagevendor-old
 
 %changelog
+* Tue Dec 18 2001 Harald Hoyer <harald@redhat.de> 12:3.6.2-10
+- took old purge patch for filters
+- fixed #54225,#58346
+- drop root by default #49635
+- fixed #54593
+- fixed #57711
+
 * Fri Aug 31 2001 Harald Hoyer <harald@redhat.de> 12:3.6.2-9
 - took better fix for #52654 from tcpdump cvs