diff --git a/tcpdump.spec b/tcpdump.spec
index f73f8e6..142b85a 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -2,12 +2,16 @@
 %define PCAP_UID 77
 %define PCAP_GID 77
 
+%define arpwatch_release 15
+%define pcap_release 15
+%define tcpdump_release 2
+
 Summary: A network traffic monitoring tool.
 Name: tcpdump
-Version: 3.6.2
+Version: 3.6.3
 %define	tcpdump_dir	tcpdump-3.6.2
 %define tcpslice_dir	tcpslice
-Release: 12
+Release: %{tcpdump_release}
 
 # XXX epoch is necessary to obsolete tcpdump-3.4a5
 Epoch: 14
@@ -30,7 +34,7 @@ Patch8: tcpdump-3.6.1-droproot2.patch
 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
+Patch12: tcpdump-3.6.2-3.6.3.patch
 Patch13: tcpdump-3.6.2-dropdefault.patch
 Patch14: tcpdump-3.6.2-snaplen.patch
 
@@ -38,9 +42,12 @@ Patch34: arpwatch-2.1a4-fhs.patch
 Patch35: arpwatch-2.1a10-man.patch
 Patch38: arpwatch-drop.patch
 Patch39: arpwatch-drop-man.patch
+Patch40: arp2ethers.patch
+Patch41: arpwatch-addr.patch
 
 Patch50: libpcap-shared.patch
 Patch51: tcpdump-3.6.2-purge.patch
+Patch52: tcpdump-3.6.2-s390.patch
 
 Patch100: tcpdump-3.6.2-config.patch
 
@@ -59,6 +66,7 @@ Install tcpdump if you need a program to monitor network traffic.
 
 %package -n libpcap
 Version: 0.6.2
+Release: %{pcap_release}
 %define	libpcap_dir	libpcap-0.6.2
 Summary: A system-independent interface for user-level packet capture.
 Group: Development/Libraries
@@ -80,6 +88,7 @@ on your network.
 
 %package -n arpwatch
 Version: 2.1a11
+Release: %{arpwatch_release}
 %define	arpwatch_dir	arpwatch-2.1a11
 Summary: Network monitoring tools for tracking IP addresses on a network.
 Group: Applications/System
@@ -106,6 +115,7 @@ network.
 pushd %libpcap_dir
 %patch50 -p1 -b .shared 
 %patch51 -p1 -b .purge
+%patch52 -p1 -b .s390
 popd
 
 pushd %tcpdump_dir
@@ -124,6 +134,8 @@ pushd %arpwatch_dir
 %patch35 -p1 -b .arpsnmpman
 %patch38 -p1 -b .droproot
 %patch39 -p0 -b .droprootman
+%patch40 -p1 -b .cshpatch
+%patch41 -p1 -b .mailuser
 chmod u+w ethercodes.dat
 cp %SOURCE6 ethercodes.dat
 popd
@@ -182,17 +194,17 @@ mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man{3,8}
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 
 pushd %libpcap_dir
-mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/pcap/net
-make DESTDIR=${RPM_BUILD_ROOT} includedir=%{_includedir}/pcap install
+mkdir -p ${RPM_BUILD_ROOT}%{_includedir}/net
+make DESTDIR=${RPM_BUILD_ROOT} includedir=%{_includedir} install
 popd
 
 pushd %tcpslice_dir
-install -m755 -s tcpslice ${RPM_BUILD_ROOT}%{_sbindir}
+install -m755 tcpslice ${RPM_BUILD_ROOT}%{_sbindir}
 install -m644 tcpslice.1 ${RPM_BUILD_ROOT}%{_mandir}/man8/tcpslice.8
 popd
 
 pushd %tcpdump_dir
-install -m755 -s tcpdump ${RPM_BUILD_ROOT}%{_sbindir}
+install -m755 tcpdump ${RPM_BUILD_ROOT}%{_sbindir}
 install -m644 tcpdump.1 ${RPM_BUILD_ROOT}%{_mandir}/man8/tcpdump.8
 popd
 
@@ -257,7 +269,7 @@ fi
 %files -n libpcap
 %defattr(-,root,root)
 %doc	%libpcap_dir/README %libpcap_dir/CHANGES
-%{_includedir}/pcap
+%{_includedir}/*
 %{_libdir}/libpcap.*
 %{_mandir}/man3/pcap.3*
 
@@ -282,7 +294,17 @@ fi
 %{_vararpwatch}/massagevendor-old
 
 %changelog
-* Wed Jan 23 2002 Harald Hoyer <harald@redhat.de>
+* Thu Aug  1 2002 Harald Hoyer <harald@redhat.de> 12:3.6.3-2
+- added arpwatch options to specify sender and recipient (#70386)
+
+* Tue Jul 23 2002 Harald Hoyer <harald@redhat.de> 12:3.6.3-1
+- removed prestripping
+
+* Thu May 16 2002 Harald Hoyer <harald@redhat.de> 12:3.6.2-13
+- added official 3.6.3 fix
+- fixed 6.2 compat #63113
+
+* Wed Jan 23 2002 Harald Hoyer <harald@redhat.de> 12:3.6.2-12
 - tcpdump-3.6.2-snaplen.patch added to fix #55145
 
 * Tue Dec 18 2001 Harald Hoyer <harald@redhat.de> 12:3.6.2-10