diff --git a/.cvsignore b/.cvsignore
index 35d9c15..abd7932 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,4 @@
-arpwatch-2.1a4.tar.gz
+arpwatch-2.1a10.tar.gz
 libpcap-0.4-ss991029.dif.gz
 libpcap-0.4.tar.gz
 tcpdump-3.4-ss991030.dif.gz
diff --git a/sources b/sources
index e5bb77a..3fd715d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
-5947f633178ec08cae49b0d2d658abfa  arpwatch-2.1a4.tar.gz
+c3f82f51f0c0bfcaf72b5fb216ab6a7b  arpwatch-2.1a10.tar.gz
 fbe47a4360a50310a5d38d24368fdbc6  libpcap-0.4-ss991029.dif.gz
 f85e53e60dea5c89b9c67b7b42c08736  libpcap-0.4.tar.gz
 433da48a4bb3d95bd747c2496c04b6ae  tcpdump-3.4-ss991030.dif.gz
diff --git a/tcpdump.spec b/tcpdump.spec
index c102633..97562ae 100644
--- a/tcpdump.spec
+++ b/tcpdump.spec
@@ -4,14 +4,14 @@ Summary: A network traffic monitoring tool.
 Name: tcpdump
 Version: 3.4
 %define	tcpdump_dir	tcpdump-3.4
-Release: 34
+Release: 39
 # XXX epoch is necessary to obsolete tcpdump-3.4a5
-Epoch: 1
+Epoch: 5
 Copyright: BSD
 Group: Applications/Internet
 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
+Source2: ftp://ftp.ee.lbl.gov/arpwatch-2.1a10.tar.gz
 Source3: arpwatch.init
 Source4: arpwatch-ethercodes.dat
 Patch0: tcpdump-3.4a5-man.patch
@@ -27,16 +27,17 @@ 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
 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
+Patch38: arpwatch-2.1a10-bug19696.patch
 Patch39: libpcap-intf.patch
+Patch40: libpcap-intf2.patch
+Patch41: libpcap-0.4-eintr.patch
+Patch42: tcpdump-3.4-interfaces.patch 
+Patch43: tcpdump-rootdrop.patch
+Patch44: tcpdump-3.4-glibc.patch
 Prefix: %{_prefix}
 BuildRequires: kernel-headers >= 2.2.0
 Requires: kernel >= 2.2.0
@@ -70,8 +71,8 @@ Install libpcap if you need to do low-level network traffic monitoring
 on your network.
 
 %package -n arpwatch
-Version: 2.1a4
-%define	arpwatch_dir	arpwatch-2.1a4
+Version: 2.1a10
+%define	arpwatch_dir	arpwatch-2.1a10
 Summary: Network monitoring tools for tracking IP addresses on a network.
 Group: Applications/System
 Prereq: /sbin/chkconfig /etc/init.d /sbin/service
@@ -97,6 +98,8 @@ cd %libpcap_dir
 %patch33 -p1 -b .fhs
 %patch36 -p1 -b .kern24
 %patch39 -p1 -b .intf
+%patch40 -p1 -b .intf2
+%patch41 -p1 -b .eintr
 cd ..
 
 cd %tcpdump_dir
@@ -113,19 +116,19 @@ cd %tcpdump_dir
 %patch26 -p1 -b .stp
 %patch27 -p1 -b .bufovfl
 %patch29 -p1 -b .ethertype
+%patch42 -p1 -b .interfaces
+%patch43 -p1 -b .rootdrop
 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
+%patch44 -p1 -b .glibc
+
 
 %build
 cd %libpcap_dir
@@ -193,9 +196,15 @@ done
 ( cd ${RPM_BUILD_ROOT}
   mkdir -p ./etc/rc.d/init.d
   install -c -m755 $RPM_SOURCE_DIR/arpwatch.init ./etc/rc.d/init.d/arpwatch
+  mkdir -p ./etc/sysconfig
+  cat >./etc/sysconfig/arpwatch <<EOF
+# Define here the options for arpwatch, e.g. -u nobody
+OPTIONS=""
+EOF
 )
 cd ..
 
+
 ( cd ${RPM_BUILD_ROOT}
   strip .%{_sbindir}/* || :
 )
@@ -238,6 +247,7 @@ fi
 %{_mandir}/man8/arpwatch.8*
 %{_mandir}/man8/arpsnmp.8*
 %config	/etc/rc.d/init.d/arpwatch
+%config /etc/sysconfig/arpwatch
 %dir	%{_vararpwatch}
 %config	%{_vararpwatch}/arp.dat
 %config	%{_vararpwatch}/ethercodes.dat
@@ -246,6 +256,29 @@ fi
 %{_vararpwatch}/massagevendor
 
 %changelog
+* Wed Feb 14 2001 Harald Hoyer <harald@redhat.de>
+- glibc sys/time -> time include patch
+
+* Wed Feb  7 2001 Trond Eivind Glomsr�d <teg@redhat.com>
+- Add space to this check
+
+* Wed Feb 07 2001 Harald Hoyer <harald@redhat.com>
+- added check for presence of /etc/sysconfig/arpwatch (#23172)
+
+* Fri Feb  2 2001 Trond Eivind Glomsr�d <teg@redhat.com>
+- i18nize initscript
+
+* Mon Jan 29 2001 Harald Hoyer <harald@redhat.com>
+- fixed EINTR stopping for e.g. SIGSTOP. (#22008)
+- added -u option for tcpdump (#20231)
+- new arpwatch version (#23172)
+- added "all" and "one" interface for -i (#20907)
+- added arpwatch sysconfig (#23172)
+
+* Mon Jan 22 2001 Harald Hoyer <harald@redhat.com>
+- more (potential) overflows in libpcap. #21373
+- documentation fix for #20906
+
 * Sun Nov 26 2000 Jeff Johnson <jbj@redhat.com>
 - more (potential) overflows in libpcap.