diff --git a/tcpdump.spec b/tcpdump.spec
index a2fdc58..c102633 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -4,7 +4,7 @@ Summary: A network traffic monitoring tool.
 Name: tcpdump
 Version: 3.4
 %define	tcpdump_dir	tcpdump-3.4
-Release: 29
+Release: 34
 # XXX epoch is necessary to obsolete tcpdump-3.4a5
 Epoch: 1
 Copyright: BSD
@@ -13,6 +13,7 @@ Source0: ftp://ftp.ee.lbl.gov/tcpdump-3.4.tar.gz
 Source1: ftp://ftp.ee.lbl.gov/libpcap-0.4.tar.gz
 Source2: ftp://ftp.ee.lbl.gov/arpwatch-2.1a4.tar.gz
 Source3: arpwatch.init
+Source4: arpwatch-ethercodes.dat
 Patch0: tcpdump-3.4a5-man.patch
 # XXX patch1 not applied, already in the Kuznetsov patch. Reapply if not.
 Patch1: tcpdump-3.4a5-sack.patch
@@ -24,6 +25,8 @@ Patch23: tcpdump-3.4-iphl.patch
 Patch24: tcpdump-3.4-getproto.patch
 Patch25: tcpdump-3.4-manpage.patch
 Patch26: ftp://openrock.net/bridge/patches/tcpdump-3.1-802.1d.diff
+Patch27: tcpdump-3.4-bufovfl.patch
+Patch29: tcpdump-3.4-ethertype.patch
 Patch30: arpwatch-2.1a4-typo.patch
 Patch31: tcpdump-3.4-ia64.patch
 Patch32: libpcap-sparc.patch
@@ -31,6 +34,9 @@ Patch33: libpcap-0.4-fhs.patch
 Patch34: arpwatch-2.1a4-fhs.patch
 Patch35: arpwatch-2.1a4-man.patch
 Patch36: libpcap-0.4-kern24.patch
+Patch37: arpwatch-2.1a4-bug18943.patch
+Patch38: arpwatch-2.1a4-bug19696.patch
+Patch39: libpcap-intf.patch
 Prefix: %{_prefix}
 BuildRequires: kernel-headers >= 2.2.0
 Requires: kernel >= 2.2.0
@@ -90,6 +96,7 @@ cd %libpcap_dir
 %endif
 %patch33 -p1 -b .fhs
 %patch36 -p1 -b .kern24
+%patch39 -p1 -b .intf
 cd ..
 
 cd %tcpdump_dir
@@ -104,12 +111,18 @@ cd %tcpdump_dir
 %patch24 -p1 -b .getproto
 %patch25 -p1 -b .manpage
 %patch26 -p1 -b .stp
+%patch27 -p1 -b .bufovfl
+%patch29 -p1 -b .ethertype
 cd ..
 
 cd %arpwatch_dir
 %patch30 -p1 -b .typo
 %patch34 -p1 -b .fhs
 %patch35 -p1 -b .arpsnmpman
+%patch37 -p1 -b .bug18943
+%patch38 -p1 -b .bug19696
+chmod u+w ethercodes.dat
+cp %SOURCE4 ethercodes.dat
 cd ..
 
 %patch31 -p1 -b .ia64
@@ -224,7 +237,7 @@ fi
 %{_sbindir}/arpsnmp
 %{_mandir}/man8/arpwatch.8*
 %{_mandir}/man8/arpsnmp.8*
-/etc/rc.d/init.d/arpwatch
+%config	/etc/rc.d/init.d/arpwatch
 %dir	%{_vararpwatch}
 %config	%{_vararpwatch}/arp.dat
 %config	%{_vararpwatch}/ethercodes.dat
@@ -233,6 +246,23 @@ fi
 %{_vararpwatch}/massagevendor
 
 %changelog
+* Sun Nov 26 2000 Jeff Johnson <jbj@redhat.com>
+- more (potential) overflows in libpcap.
+
+* Sun Nov 12 2000 Jeff Johnson <jbj@redhat.com>
+- eliminate still more buffer overflows (from FreeBSD) (#20069).
+
+* Thu Nov  2 2000 Jeff Johnson <jbj@redhat.com>
+- eliminate more buffer overflows (from FreeBSD) (#20069).
+- 802.1q ether type incorrect (#19850).
+- add -u flag to drop arpwatch privs (#19696).
+
+* Sun Oct 15 2000 Jeff Johnson <jbj@redhat.com>
+- updated ethercodes.dat
+
+* Thu Oct 12 2000 Jeff Johnson <jbj@redhat.com>
+- fix arpwatch tmp race (#18943).
+
 * Fri Aug 11 2000 Bill Nottingham <notting@redhat.com>
 - fix condrestart