diff --git a/tcpdump.spec b/tcpdump.spec
index 2b67ad5..2e1ef09 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -2,9 +2,11 @@
 %define PCAP_UID 77
 %define PCAP_GID 77
 
-%define arpwatch_release 16
-%define pcap_release 16
-%define tcpdump_release 4
+%define releaseno 17.8.0.2
+
+%define arpwatch_release %{releaseno}
+%define pcap_release %{releaseno}
+%define tcpdump_release %{releaseno}
 
 Summary: A network traffic monitoring tool.
 Name: tcpdump
@@ -37,6 +39,10 @@ Patch11: tcpdump-3.6.1-non-promisc-default.patch
 Patch12: tcpdump-3.6.2-3.6.3.patch
 Patch13: tcpdump-3.6.2-dropdefault.patch
 Patch14: tcpdump-3.6.2-snaplen.patch
+Patch16: tcpdump-3.6.2-bgp.patch
+Patch17: tcpdump-3.6.2-radlen.patch
+Patch18: tcpdump-3.6.2-isa.patch
+Patch19: tcpdump-3.6.2-2.4.patch
 
 Patch34: arpwatch-2.1a4-fhs.patch
 Patch35: arpwatch-2.1a10-man.patch
@@ -127,6 +133,10 @@ pushd %tcpdump_dir
 %patch12 -p1 -b .afsprinting
 %patch13 -p1 -b .dropdefault
 %patch14 -p1 -b .snaplen
+#%patch16 -p2 -b .bgp
+%patch17 -p1 -b .radlen
+#%patch18 -p1 -b .isa
+%patch19 -p1 -b .deb
 popd
 
 pushd %arpwatch_dir
@@ -284,7 +294,7 @@ fi
 %config(noreplace) /etc/sysconfig/arpwatch
 %defattr(-,pcap,pcap)
 %dir	%{_vararpwatch}
-%config	%{_vararpwatch}/arp.dat
+%config(noreplace) %verify(not md5 size mtime) %{_vararpwatch}/arp.dat
 %config	%{_vararpwatch}/ethercodes.dat
 %config	%{_vararpwatch}/missingcodes.txt
 %{_vararpwatch}/*.awk
@@ -294,8 +304,11 @@ fi
 %{_vararpwatch}/massagevendor-old
 
 %changelog
-* Mon Nov 18 2002 Tim Powers <timp@redhat.com>
-- rebuild on all arches
+* Mon Apr 14 2003 Harald Hoyer <harald@redhat.de> -17.x.x.2
+- CAN-2003-0145 fixed
+
+* Thu Mar 06 2003 Harald Hoyer <harald@redhat.de> -17.x.x.1
+- CAN-2003-0108 fixed
 
 * Fri Aug  2 2002 Harald Hoyer <harald@redhat.de> 12:3.6.3-3/0.6.2-16/2.1a11-16
 - added man page descriptions for the new parameters