diff -Naru arpwatch-2.1a15.orig/arp2ethers arpwatch-2.1a15/arp2ethers
--- arpwatch-2.1a15.orig/arp2ethers	2002-01-05 22:40:48.000000000 +0300
+++ arpwatch-2.1a15/arp2ethers	2006-09-23 22:47:02.000000000 +0400
@@ -13,11 +13,10 @@
 #	- sort
 #
 
-sort +2rn arp.dat | \
-    awk 'NF == 4 { print }' | \
+export AWKPATH="$AWKPATH:/usr/share/arpwatch/awk"
+
+sort -k 3rn ${1:-/var/lib/arpwatch/arp.dat} | \
     awk -f p.awk | \
-    egrep -v '\.[0-9][0-9]*$' | \
-    sed -e 's/	.*	/	/' | \
     awk -f d.awk | \
     awk -f e.awk | \
     sort
diff -Naru arpwatch-2.1a15.orig/massagevendor arpwatch-2.1a15/massagevendor
--- arpwatch-2.1a15.orig/massagevendor	2004-01-28 22:32:43.000000000 +0300
+++ arpwatch-2.1a15/massagevendor	2006-09-23 22:49:42.000000000 +0400
@@ -9,6 +9,9 @@
 #
 # - Deal with duplicates in oui.txt (concatenate company names)
 #
+
+export AWKPATH="$AWKPATH:/usr/share/arpwatch/awk"
+
 (sed -n \
     -e 's/^\([0-9A-F][0-9A-F]\)-\([0-9A-F][0-9A-F]\)-\([0-9A-F][0-9A-F]\)  *(hex)[ 	]*\(..*\)/\1\2\3	\4/p' \
     $* | \