Makefile.in    |    8 +-
 addresses.h.in |    4 +-
 arpsnmp.8      |   37 +++-
 arpsnmp.c      |   28 ++-
 arpwatch.8     |   50 ++++-
 arpwatch.c     |   92 +++++---
 arpwatch.h     |   10 +-
 configure.in   |   31 ++-
 dns.c          |    1 +
 ethercodes.dat |  773 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
 mkdep          |   21 +-
 report.c       |    8 +-
 util.c         |    1 +
 13 files changed, 949 insertions(+), 115 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 75fb4ba..4e42fb7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -110,13 +110,13 @@ zap: zap.o intoa.o
 	$(CC) $(CFLAGS) -o $@ zap.o intoa.o -lutil
 
 install: force
-	$(INSTALL) -m 555 -o bin -g bin arpwatch $(DESTDIR)$(BINDEST)
-	$(INSTALL) -m 555 -o bin -g bin arpsnmp $(DESTDIR)$(BINDEST)
+	$(INSTALL) -m 755 arpwatch $(DESTDIR)$(BINDEST)
+	$(INSTALL) -m 755 arpsnmp $(DESTDIR)$(BINDEST)
 
 install-man: force
-	$(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpwatch.8 \
+	$(INSTALL) -m 644 $(srcdir)/arpwatch.8 \
 	    $(DESTDIR)$(MANDEST)/man8
-	$(INSTALL) -m 444 -o bin -g bin $(srcdir)/arpsnmp.8 \
+	$(INSTALL) -m 644 $(srcdir)/arpsnmp.8 \
 	    $(DESTDIR)$(MANDEST)/man8
 
 lint:	$(GENSRC) force
diff --git a/addresses.h.in b/addresses.h.in
index 3071abf..e30efc2 100644
--- a/addresses.h.in
+++ b/addresses.h.in
@@ -1,2 +1,4 @@
 #define WATCHER "root"
-#define WATCHEE "arpwatch (Arpwatch)"
+#define WATCHEE "root (Arpwatch)"
+extern char *watcher;
+extern char *watchee;
diff --git a/arpsnmp.8 b/arpsnmp.8
index 9f39582..603fcd9 100644
--- a/arpsnmp.8
+++ b/arpsnmp.8
@@ -30,6 +30,12 @@ arpsnmp - keep track of ethernet/ip address pairings
 ] [
 .B -f
 .I datafile
+] [
+.B -e
+.I username
+] [
+.B -s
+.I username
 ]
 .I file
 [
@@ -41,7 +47,7 @@ keeps track for ethernet/ip address pairings. It syslogs activity
 and reports certain changes via email.
 .B Arpsnmp
 reads information from a file (usually generated by
-.BR snmpwalk (8)).
+.BR snmpwalk (1)).
 .LP
 The
 .B -d
@@ -60,16 +66,37 @@ Note that an empty
 file must be created before the first time you run
 .BR arpsnmp .
 .LP
+If the
+.B -e
+flag is used,
+.B arpsnmp
+sends e-mail messages to
+.I username
+rather than the default (root).
+If a single `-' character is given for the username,
+sending of e-mail is suppressed,
+but logging via syslog is still done as usual.
+(This can be useful during initial runs, to collect data
+without being flooded with messages about new stations.)
+.LP
+If the
+.B -s
+flag is used,
+.B arpsnmp
+sends e-mail messages with
+.I username
+as the return address, rather than the default (root).
+.LP
 .SH "REPORT MESSAGES"
 (See the
-.BR arpwatch (1)
+.BR arpwatch (8)
 man page for details on the report messages generated by
-.BR arpsnmp (1).)
+.BR arpsnmp (8).)
 .SH FILES
 .na
 .nh
 .nf
-/usr/operator/arpwatch - default directory
+/var/lib/arpwatch - default directory
 arp.dat - ethernet/ip address database
 ethercodes.dat - vendor ethernet block list
 .ad
@@ -78,8 +105,8 @@ ethercodes.dat - vendor ethernet block list
 .SH "SEE ALSO"
 .na
 .nh
+.BR snmpwalk (1),
 .BR arpwatch (8),
-.BR snmpwalk (8),
 .BR arp (8)
 .ad
 .hy
diff --git a/arpsnmp.c b/arpsnmp.c
index e35ff2e..a419687 100644
--- a/arpsnmp.c
+++ b/arpsnmp.c
@@ -35,6 +35,7 @@ static const char rcsid[] =
 #include <sys/file.h>
 
 #include <ctype.h>
+#include <errno.h>
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
 #endif
@@ -59,6 +60,7 @@ static const char rcsid[] =
 #include "file.h"
 #include "machdep.h"
 #include "util.h"
+#include "addresses.h"
 
 /* Forwards */
 int	main(int, char **);
@@ -66,7 +68,9 @@ int	readsnmp(char *);
 int	snmp_add(u_int32_t, u_char *, time_t, char *);
 __dead	void usage(void) __attribute__((volatile));
 
-char *prog;
+#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+const char *prog;
+#endif
 
 extern int optind;
 extern int opterr;
@@ -75,14 +79,18 @@ extern char *optarg;
 int
 main(int argc, char **argv)
 {
-	register char *cp;
 	register int op, i;
 	char errbuf[256];
 
-	if ((cp = strrchr(argv[0], '/')) != NULL)
+#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+	const char *cp;
+	if (argv[0] == NULL)
+		prog = "arpsnmp";
+	else if ((cp = strrchr(argv[0], '/')) != NULL)
 		prog = cp + 1;
 	else
 		prog = argv[0];
+#endif
 
 	if (abort_on_misalignment(errbuf) < 0) {
 		(void)fprintf(stderr, "%s: %s\n", prog, errbuf);
@@ -90,7 +98,7 @@ main(int argc, char **argv)
 	}
 
 	opterr = 0;
-	while ((op = getopt(argc, argv, "df:")) != EOF)
+	while ((op = getopt(argc, argv, "df:e:s:")) != EOF)
 		switch (op) {
 
 		case 'd':
@@ -105,6 +113,14 @@ main(int argc, char **argv)
 			arpfile = optarg;
 			break;
 
+		case 'e':
+			watcher = strdup(optarg);
+			break;
+
+		case 's':
+			watchee = strdup(optarg);
+			break;
+
 		default:
 			usage();
 		}
@@ -112,7 +128,7 @@ main(int argc, char **argv)
 	if (optind == argc)
 		usage();
 
-	openlog(prog, 0, LOG_DAEMON);
+	openlog(prog, LOG_PID, LOG_DAEMON);
 
 	/* Read in database */
 	initializing = 1;
@@ -185,6 +201,6 @@ usage(void)
 
 	(void)fprintf(stderr, "Version %s\n", version);
 	(void)fprintf(stderr,
-	    "usage: %s [-d] [-f datafile] file [...]\n", prog);
+	    "usage: %s [-d] [-f datafile] [-e username] [-s username] file [...]\n", prog);
 	exit(1);
 }
diff --git a/arpwatch.8 b/arpwatch.8
index 4b15d3b..36b5ac8 100644
--- a/arpwatch.8
+++ b/arpwatch.8
@@ -36,13 +36,22 @@ arpwatch - keep track of ethernet/ip address pairings
 .I interface
 ]
 .br
-.ti +8
+.ti +9
 [
 .B -n
 .IR net [/ width
 ]] [
 .B -r
 .I file
+] [
+.B -u
+.I username
+] [
+.B -e
+.I username
+] [
+.B -s
+.I username
 ]
 .ad
 .SH DESCRIPTION
@@ -94,10 +103,47 @@ of reading from the network. In this case,
 .B arpwatch
 does not fork.
 .LP
+If
+.B -u
+flag is used,
+.B arpwatch
+drops root privileges and changes user ID to
+.I username
+and group ID to that of the primary group of
+.IR username .
+This is recommended for security reasons.
+.LP
+If the
+.B -e
+flag is used,
+.B arpwatch
+sends e-mail messages to
+.I username
+rather than the default (root).
+If a single `-' character is given for the username,
+sending of e-mail is suppressed,
+but logging via syslog is still done as usual.
+(This can be useful during initial runs, to collect data
+without being flooded with messages about new stations.)
+.LP
+If the
+.B -s
+flag is used,
+.B arpwatch
+sends e-mail messages with
+.I username
+as the return address, rather than the default (root).
+.LP
 Note that an empty
 .I arp.dat
 file must be created before the first time you run
 .BR arpwatch .
+Also, the default directory (where arp.dat is stored)
+must be writable by
+.I username
+if
+.BR -u
+flag is used.
 .LP
 .SH "REPORT MESSAGES"
 Here's a quick list of the report messages generated by
@@ -152,7 +198,7 @@ addresses was a DECnet address.
 .na
 .nh
 .nf
-/usr/operator/arpwatch - default directory
+/var/lib/arpwatch - default directory
 arp.dat - ethernet/ip address database
 ethercodes.dat - vendor ethernet block list
 .ad
diff --git a/arpwatch.c b/arpwatch.c
index 38e5e34..cb7c039 100644
--- a/arpwatch.c
+++ b/arpwatch.c
@@ -63,6 +63,8 @@ struct rtentry;
 #include <syslog.h>
 #include <unistd.h>
 
+#include <pwd.h>
+#include <grp.h>
 #include <pcap.h>
 
 #include "gnuc.h"
@@ -78,6 +80,7 @@ struct rtentry;
 #include "machdep.h"
 #include "setsignal.h"
 #include "util.h"
+#include "addresses.h"
 
 /* Some systems don't define these */
 #ifndef ETHERTYPE_REVARP
@@ -105,7 +108,9 @@ struct rtentry;
 #define max(a,b) ((b)>(a)?(b):(a))
 #endif
 
-char *prog;
+#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+const char *prog;
+#endif
 
 int can_checkpoint;
 int swapped;
@@ -141,25 +146,47 @@ int	sanity_ether(struct ether_header *, struct ether_arp *, int);
 int	sanity_fddi(struct fddi_header *, struct ether_arp *, int);
 __dead	void usage(void) __attribute__((volatile));
 
+static void
+drop_privs(const char *user)
+{
+	struct passwd *pw;
+
+	if (!user || !*user)
+		return;
+	if (!(pw = getpwnam(user))) {
+		syslog(LOG_ERR, "Couldn't find user '%.32s'", user);
+		exit(1);
+	}
+	if (initgroups(pw->pw_name, pw->pw_gid) ||
+	    setgid(pw->pw_gid) ||
+	    setuid(pw->pw_uid)) {
+		syslog(LOG_ERR, "Couldn't switch to '%.32s' uid=%d gid=%d",
+				user, pw->pw_uid, pw->pw_gid);
+		exit(1);
+	}
+	endpwent();
+	syslog(LOG_DEBUG, "Running as uid=%d gid=%d", getuid(), getgid());
+}
+
 int
 main(int argc, char **argv)
 {
-	register char *cp;
-	register int op, pid, snaplen, timeout, linktype, status;
-#ifdef TIOCNOTTY
-	register int fd;
-#endif
+	register int op, snaplen, timeout, linktype, status;
 	register pcap_t *pd;
 	register char *interface, *rfilename;
 	struct bpf_program code;
 	char errbuf[PCAP_ERRBUF_SIZE];
+	char *runas_user = "_arpwd";
 
+#ifndef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+	const char *cp;
 	if (argv[0] == NULL)
 		prog = "arpwatch";
 	else if ((cp = strrchr(argv[0], '/')) != NULL)
 		prog = cp + 1;
 	else
 		prog = argv[0];
+#endif
 
 	if (abort_on_misalignment(errbuf) < 0) {
 		(void)fprintf(stderr, "%s: %s\n", prog, errbuf);
@@ -170,7 +197,7 @@ main(int argc, char **argv)
 	interface = NULL;
 	rfilename = NULL;
 	pd = NULL;
-	while ((op = getopt(argc, argv, "df:i:n:Nr:")) != EOF)
+	while ((op = getopt(argc, argv, "df:i:n:Nr:u:e:s:")) != EOF)
 		switch (op) {
 
 		case 'd':
@@ -202,6 +229,18 @@ main(int argc, char **argv)
 			rfilename = optarg;
 			break;
 
+		case 'u':
+			runas_user = strdup(optarg);
+			break;
+
+		case 'e':
+			watcher = strdup(optarg);
+			break;
+
+		case 's':
+			watchee = strdup(optarg);
+			break;
+
 		default:
 			usage();
 		}
@@ -209,6 +248,8 @@ main(int argc, char **argv)
 	if (optind != argc)
 		usage();
 
+	openlog(prog, LOG_PID, LOG_DAEMON);
+
 	if (rfilename != NULL) {
 		net = 0;
 		netmask = 0;
@@ -229,30 +270,12 @@ main(int argc, char **argv)
 		}
 
 		/* Drop into the background if not debugging */
-		if (!debug) {
-			pid = fork();
-			if (pid < 0) {
-				syslog(LOG_ERR, "main fork(): %m");
-				exit(1);
-			} else if (pid != 0)
-				exit(0);
-			(void)close(fileno(stdin));
-			(void)close(fileno(stdout));
-			(void)close(fileno(stderr));
-#ifdef TIOCNOTTY
-			fd = open("/dev/tty", O_RDWR);
-			if (fd >= 0) {
-				(void)ioctl(fd, TIOCNOTTY, 0);
-				(void)close(fd);
-			}
-#else
-			(void) setsid();
-#endif
+		if (!debug && daemon(0, 0)) {
+			syslog(LOG_ERR, "main daemon(): %m");
+			exit(1);
 		}
 	}
 
-	openlog(prog, 0, LOG_DAEMON);
-
 	if (chdir(arpdir) < 0) {
 		syslog(LOG_ERR, "chdir(%s): %m", arpdir);
 		syslog(LOG_ERR, "(using current working directory)");
@@ -281,10 +304,8 @@ main(int argc, char **argv)
 
 	/*
 	 * Revert to non-privileged user after opening sockets
-	 * (not needed on most systems).
 	 */
-	setgid(getgid());
-	setuid(getuid());
+	drop_privs(runas_user);
 
 	/* Must be ethernet or fddi */
 	linktype = pcap_datalink(pd);
@@ -425,7 +446,8 @@ sanity_ether(register struct ether_header *eh, register struct ether_arp *ea,
 	ea->arp_op = ntohs(ea->arp_op);
 
 	if (len < sizeof(*eh) + sizeof(*ea)) {
-		syslog(LOG_ERR, "short (want %d)\n", sizeof(*eh) + sizeof(*ea));
+		syslog(LOG_ERR, "short (want %u)\n",
+		       (unsigned)(sizeof(*eh) + sizeof(*ea)));
 		return(0);
 	}
 
@@ -577,7 +599,8 @@ sanity_fddi(register struct fddi_header *fh, register struct ether_arp *ea,
 	op = ntohs(op);
 
 	if (len < sizeof(*fh) + sizeof(*ea)) {
-		syslog(LOG_ERR, "short (want %d)\n", sizeof(*fh) + sizeof(*ea));
+		syslog(LOG_ERR, "short (want %u)\n",
+		       (unsigned)(sizeof(*fh) + sizeof(*ea)));
 		return(0);
 	}
 
@@ -751,6 +774,7 @@ usage(void)
 
 	(void)fprintf(stderr, "Version %s\n", version);
 	(void)fprintf(stderr, "usage: %s [-dN] [-f datafile] [-i interface]"
-	    " [-n net[/width]] [-r file]\n", prog);
+	    " [-n net[/width]] [-r file] [-u username]"
+	    " [-e username] [-s username]\n", prog);
 	exit(1);
 }
diff --git a/arpwatch.h b/arpwatch.h
index 64ac518..d92813f 100644
--- a/arpwatch.h
+++ b/arpwatch.h
@@ -14,7 +14,15 @@ char	*intoa(u_int32_t);
 void bcopy(const void *, void *, size_t);
 #endif
 
-extern char *prog;
+#ifdef __GLIBC__
+# define HAVE_PROGRAM_INVOCATION_SHORT_NAME
+#endif
+
+#ifdef HAVE_PROGRAM_INVOCATION_SHORT_NAME
+# define prog program_invocation_short_name
+#else
+extern const char *prog;
+#endif
 
 #ifdef ETHER_HEADER_HAS_EA
 #define ESRC(ep) ((ep)->ether_shost.ether_addr_octet)
diff --git a/configure.in b/configure.in
index efcae6a..866b3b2 100755
--- a/configure.in
+++ b/configure.in
@@ -9,8 +9,8 @@ dnl
 AC_INIT(arpwatch.c)
 
 AC_CANONICAL_SYSTEM
-
-umask 002
+AC_GNU_SOURCE
+AC_SYS_LARGEFILE
 
 if test -z "$PWD" ; then
 	PWD=`pwd`
@@ -29,7 +29,26 @@ AC_C_BIGENDIAN
 AC_LBL_TYPE_SIGNAL
 AC_LBL_UNION_WAIT
 
-AC_CHECK_LIB(resolv, res_query)
+AC_MSG_CHECKING(for res_query)
+AC_TRY_LINK_FUNC(res_query, AC_MSG_RESULT(yes),
+   [AC_MSG_RESULT(no)
+    saved_LIBS="$LIBS"
+    LIBS="$LIBS -lresolv"
+    AC_MSG_CHECKING(for res_query in -lresolv)
+    AC_LINK_IFELSE([
+#include <resolv.h>
+int main()
+{
+	res_query (0, 0, 0, 0, 0);
+	return 0;
+}
+	],
+	[LIBS="$LIBS -lresolv"
+	 AC_MSG_RESULT(yes)],
+	[LIBS="$saved_LIBS"
+	 AC_MSG_RESULT(no)])
+   ])
+
 AC_LBL_LIBPCAP(V_PCAPDEP, V_INCLS)
 
 AC_PATH_PROG(V_SENDMAIL, sendmail, /usr/lib/sendmail,
@@ -37,17 +56,13 @@ AC_PATH_PROG(V_SENDMAIL, sendmail, /usr/lib/sendmail,
 
 case "$target_os" in
 
-linux*)
-	V_INCLS="$V_INCLS -Ilinux-include"
-	;;
-
 osf3*)
 	# workaround around ip_hl vs. ip_vhl problem in netinet/ip.h
 	AC_DEFINE(__STDC__,2)
 	;;
 esac
 
-AC_LBL_CHECK_TYPE
+dnl AC_LBL_CHECK_TYPE
 
 AC_LBL_DEVEL(V_CCOPT)
 
diff --git a/dns.c b/dns.c
index 2300af2..114c1ce 100644
--- a/dns.c
+++ b/dns.c
@@ -76,6 +76,7 @@ gethinfo(register char *hostname, register char *cpu, register int cpulen,
     register char *os, register int oslen)
 {
 #ifdef HAVE_DN_SKIPNAME
+	extern u_int16_t _getshort(const u_char *);
 	register querybuf *qb;
 	register u_char *cp, *eom;
 	register char *bp;
diff --git a/ethercodes.dat b/ethercodes.dat
index 1c05f21..4747e23 100644
--- a/ethercodes.dat
+++ b/ethercodes.dat
@@ -354,7 +354,7 @@
 0:10:6a	DIGITAL MICROWAVE CORPORATION
 0:10:6b	SONUS NETWORKS, INC.
 0:10:6c	INFRATEC PLUS GmbH
-0:10:6d	INTEGRITY COMMUNICATIONS, INC.
+0:10:6d	Axxcelera Broadband Wireless
 0:10:6e	TADIRAN COM. LTD.
 0:10:6f	TRENTON TECHNOLOGY INC.
 0:10:7	CISCO SYSTEMS, INC.
@@ -501,7 +501,7 @@
 0:10:f5	AMHERST SYSTEMS, INC.
 0:10:f6	CISCO SYSTEMS, INC.
 0:10:f7	IRIICHI TECHNOLOGIES Inc.
-0:10:f8	KENWOOD TMI CORPORATION
+0:10:f8	TEXIO CORPORATION
 0:10:f9	UNIQUE SYSTEMS, INC.
 0:10:fa	ZAYANTE, INC.
 0:10:fb	ZIDA TECHNOLOGIES LIMITED
@@ -807,13 +807,13 @@
 0:12:33	JRC TOKKI Co.,Ltd.
 0:12:34	Camille Bauer
 0:12:35	Andrew Corporation
-0:12:36	Tidal Networks
+0:12:36	ConSentry Networks
 0:12:37	Texas Instruments
 0:12:38	SetaBox Technology Co., Ltd.
 0:12:39	S Net Systems Inc.
 0:12:3a	Posystech Inc., Co.
 0:12:3b	KeRo Systems ApS
-0:12:3c	IP3 Networks, Inc.
+0:12:3c	Second Rule LLC
 0:12:3d	GES
 0:12:3e	ERUNE technology Co., Ltd.
 0:12:3f	Dell Inc
@@ -829,7 +829,7 @@
 0:12:48	Kashya Inc.
 0:12:49	Delta Elettronica S.p.A.
 0:12:4a	Dedicated Devices, Inc.
-0:12:4b	Chipcon AS
+0:12:4b	Texas Instruments
 0:12:4c	BBWM Corporation
 0:12:4d	Inducon BV
 0:12:4e	XAC AUTOMATION CORP.
@@ -1120,7 +1120,7 @@
 0:13:69	Honda Electron Co., LED.
 0:13:6a	Hach Ultra Analytics
 0:13:6b	E-TEC
-0:13:6c	PRIVATE
+0:13:6c	TomTom
 0:13:6d	Tentaculus AB
 0:13:6e	Techmetro Corp.
 0:13:6f	PacketMotion, Inc.
@@ -1161,7 +1161,7 @@
 0:13:9	Ocean Broadband Networks
 0:13:90	Termtek Computer Co., Ltd
 0:13:91	OUEN CO.,LTD.
-0:13:92	Video54 Technologies, Inc
+0:13:92	Ruckus Wireless
 0:13:93	Panta Systems, Inc.
 0:13:94	Infohand Co.,Ltd
 0:13:95	congatec AG
@@ -1204,7 +1204,7 @@
 0:13:b8	RyCo Electronic Systems Limited
 0:13:b9	BM SPA
 0:13:ba	ReadyLinks Inc
-0:13:bb	PRIVATE
+0:13:bb	Smartvue Corporation
 0:13:bc	Artimi Ltd
 0:13:bd	HYMATOM SA
 0:13:be	Virtual Conexions
@@ -1477,7 +1477,7 @@
 0:14:c8	Contemporary Research Corp
 0:14:c9	Silverback Systems, Inc.
 0:14:ca	Key Radio Systems Limited
-0:14:cb	GMP|Wireless Medicine,Inc.
+0:14:cb	LifeSync Corporation
 0:14:cc	Zetec, Inc.
 0:14:cd	DigitalZone Co., Ltd.
 0:14:ce	NF CORPORATION
@@ -1493,7 +1493,7 @@
 0:14:d7	DataStor Technology Inc.
 0:14:d8	bio-logic SA
 0:14:d9	IP Fabrics, Inc.
-0:14:da	Sonicaid
+0:14:da	Huntleigh Healthcare
 0:14:db	Elma Trenew Electronic GmbH
 0:14:dc	Communication System Design & Manufacturing (CSDM)
 0:14:dd	Covergence Inc.
@@ -1584,7 +1584,7 @@
 0:15:3c	Kprotech Co., Ltd.
 0:15:3d	ELIM PRODUCT CO.
 0:15:3e	Q-Matic Sweden AB
-0:15:3f	Alenia Spazio S.p.A.
+0:15:3f	Alcatel Alenia Space Italia
 0:15:4	GAME PLUS CO., LTD.
 0:15:40	Nortel
 0:15:41	StrataLight Communications, Inc.
@@ -2037,7 +2037,7 @@
 0:16:f5	Dalian Golden Hualu Digital Technology Co.,Ltd
 0:16:f6	Video Products Group
 0:16:f7	L-3 Communications, Electrodynamics, Inc.
-0:16:f8	PRIVATE
+0:16:f8	AVIQTECH TECHNOLOGY CO., LTD.
 0:16:f9	CETRTA POT, d.o.o., Kranj
 0:16:fa	ECI Telecom Ltd.
 0:16:fb	SHENZHEN MTC CO.,LTD.
@@ -2101,7 +2101,7 @@
 0:17:40	Technologies Labtronix
 0:17:41	DEFIDEV
 0:17:42	FUJITSU LIMITED
-0:17:43	PRIVATE
+0:17:43	Deck Srl
 0:17:44	Araneo Ltd.
 0:17:45	INNOTZ CO., Ltd
 0:17:46	Freedom9 Inc.
@@ -2131,7 +2131,7 @@
 0:17:5d	Dongseo system.
 0:17:5e	Anta Systems, Inc.
 0:17:5f	XENOLINK Communications Co., Ltd.
-0:17:6	Techfaithwireless Communication Technology Limited.
+0:17:6	Techfaith Wireless Communication Technology Limited.
 0:17:60	Naito Densei Machida MFG.CO.,LTD
 0:17:61	ZKSoftware Inc.
 0:17:62	Solar Technology, Inc.
@@ -2362,7 +2362,7 @@
 0:18:45	NPL Pulsar Ltd.
 0:18:46	Crypto S.A.
 0:18:47	AceNet Technology Inc.
-0:18:48	Vcom Inc.
+0:18:48	Vecima Networks Inc.
 0:18:49	Pigeon Point Systems
 0:18:4a	Catcher, Inc.
 0:18:4b	Las Vegas Gaming, Inc.
@@ -2571,20 +2571,248 @@
 0:19:19	ASTEL Inc.
 0:19:1a	IRLINK
 0:19:1b	Sputnik Engineering AG
+0:19:1c	Sensicast Systems
+0:19:1d	Nintendo Co.,Ltd.
+0:19:1e	Beyondwiz Co., Ltd.
+0:19:1f	Microlink communications Inc.
 0:19:2	Cambridge Consultants Ltd
+0:19:20	KUME electric Co.,Ltd.
+0:19:21	Elitegroup Computer System Co.
+0:19:22	CM Comandos Lineares
+0:19:23	Phonex Korea Co., LTD.
+0:19:24	LBNL  Engineering
+0:19:25	Intelicis Corporation
+0:19:26	BitsGen Co., Ltd.
+0:19:27	ImCoSys Ltd
+0:19:28	Siemens AG, Transportation Systems
+0:19:29	2M2B Montadora de Maquinas Bahia Brasil LTDA
+0:19:2a	Antiope Associates
+0:19:2b	Hexagram, Inc.
+0:19:2c	Motorola Mobile Devices
+0:19:2d	Nokia Corporation
+0:19:2e	Spectral Instruments, Inc.
+0:19:2f	Cisco Systems
 0:19:3	Bigfoot Networks Inc
+0:19:30	Cisco Systems
+0:19:31	Balluff GmbH
+0:19:32	Gude Analog- und Digialsysteme GmbH
+0:19:33	Strix Systems, Inc.
+0:19:34	TRENDON TOUCH TECHNOLOGY CORP.
+0:19:35	Duerr Dental GmbH & Co. KG
+0:19:36	STERLITE OPTICAL TECHNOLOGIES LIMITED
+0:19:37	CommerceGuard AB
+0:19:38	UMB Communications Co., Ltd.
+0:19:39	Gigamips
+0:19:3a	OESOLUTIONS
+0:19:3b	Deliberant LLC
+0:19:3c	HighPoint Technologies Incorporated
+0:19:3d	GMC Guardian Mobility Corp.
+0:19:3e	PIRELLI BROADBAND SOLUTIONS
+0:19:3f	RDI technology(Shenzhen) Co.,LTD
 0:19:4	WB Electronics Sp. z o.o.
+0:19:40	Rackable Systems
+0:19:41	Pitney Bowes, Inc
+0:19:42	ON SOFTWARE INTERNATIONAL LIMITED
+0:19:43	Belden
+0:19:44	Fossil Partners, L.P.
+0:19:45	Ten-Tec Inc.
+0:19:46	Cianet Industria e Comercio S/A
+0:19:47	Scientific Atlanta, A Cisco Company
+0:19:48	AireSpider Networks
+0:19:49	TENTEL  COMTECH CO., LTD.
+0:19:4a	TESTO AG
+0:19:4b	SAGEM COMMUNICATION
+0:19:4c	Fujian Stelcom information & Technology CO.,Ltd
+0:19:4d	Avago Technologies Sdn Bhd
+0:19:4e	Ultra Electronics - TCS (Tactical Communication Systems)
+0:19:4f	Nokia Danmark A/S
 0:19:5	SCHRACK Seconet AG
+0:19:50	Harman Multimedia
+0:19:51	NETCONS, s.r.o.
+0:19:52	ACOGITO Co., Ltd
+0:19:53	Chainleader Communications Corp.
+0:19:54	Leaf Corporation.
+0:19:55	Cisco Systems
+0:19:56	Cisco Systems
+0:19:57	Saafnet Canada Inc.
+0:19:58	Bluetooth SIG, Inc.
+0:19:59	Staccato Communications Inc.
+0:19:5a	Jenaer Antriebstechnik GmbH
+0:19:5b	D-Link Corporation
+0:19:5c	Innotech Corporation
+0:19:5d	ShenZhen XinHuaTong Opto Electronics Co.,Ltd
+0:19:5e	Motorola CHS
+0:19:5f	Valemount Networks Corporation
 0:19:6	Cisco Systems
+0:19:60	DoCoMo Systems, Inc.
+0:19:61	Blaupunkt GmbH
+0:19:62	Commerciant, LP
+0:19:63	Sony Ericsson Mobile Communications AB
+0:19:64	Doorking Inc.
+0:19:65	YuHua TelTech (ShangHai) Co., Ltd.
+0:19:66	Asiarock Technology Limited
+0:19:67	TELDAT Sp.J.
+0:19:68	Digital Video Networks(Shanghai) CO. LTD.
+0:19:69	Nortel
+0:19:6a	MikroM GmbH
+0:19:6b	Danpex Corporation
+0:19:6c	ETROVISION TECHNOLOGY
+0:19:6d	Raybit Systems Korea, Inc
+0:19:6e	Metacom (Pty) Ltd.
+0:19:6f	SensoPart GmbH
 0:19:7	Cisco Systems
+0:19:70	Z-Com, Inc.
+0:19:71	Guangzhou Unicomp Technology Co.,Ltd
+0:19:72	Plexus (Xiamen) Co.,ltd
+0:19:73	Zeugma Systems
+0:19:74	AboCom Systems, Inc.
+0:19:75	Beijing Huisen networks technology Inc
+0:19:76	Xipher Technologies, LLC
+0:19:77	Aerohive Networks, Inc.
+0:19:78	Datum Systems, Inc.
+0:19:79	Nokia Danmark A/S
+0:19:7a	MAZeT GmbH
+0:19:7b	Picotest Corp.
+0:19:7c	Riedel Communications GmbH
+0:19:7d	Hon Hai Precision Ind. Co., Ltd
+0:19:7e	Hon Hai Precision Ind. Co., Ltd
+0:19:7f	PLANTRONICS, INC.
 0:19:8	Duaxes Corporation
+0:19:80	Gridpoint Systems
+0:19:81	Vivox Inc
+0:19:82	SmarDTV
+0:19:83	CCT R&D Limited
+0:19:84	ESTIC Corporation
+0:19:85	IT Watchdogs, Inc
+0:19:86	Cheng Hongjian
+0:19:87	Panasonic Mobile Communications Co., Ltd.
+0:19:88	Wi2Wi, Inc
+0:19:89	Sonitrol Corporation
+0:19:8a	Northrop Grumman Systems Corp.
+0:19:8b	Novera Optics Korea, Inc.
+0:19:8c	iXSea
+0:19:8d	Ocean Optics, Inc.
+0:19:8e	Oticon A/S
+0:19:8f	Alcatel Bell N.V.
 0:19:9	Devi A/S
+0:19:90	ELM DATA Co., Ltd.
+0:19:91	avinfo
+0:19:92	Bluesocket, Inc
+0:19:93	Changshu Switchgear MFG. Co.,Ltd. (Former Changshu Switchgea
+0:19:94	Jorjin technologies inc.
+0:19:95	Jurong Hi-Tech (Suzhou)Co.ltd
+0:19:96	TurboChef Technologies Inc.
+0:19:97	Soft Device Sdn Bhd
+0:19:98	SATO CORPORATION
+0:19:99	Fujitsu Siemens Computers
+0:19:9a	EDO-EVI
+0:19:9b	Diversified Technical Systems, Inc.
+0:19:9c	CTRING
+0:19:9d	V, Inc.
+0:19:9e	SHOWADENSHI ELECTRONICS,INC.
+0:19:9f	DKT A/S
 0:19:a	HASWARE INC.
+0:19:a0	NIHON DATA SYSTENS, INC.
+0:19:a1	LG INFORMATION & COMM.
+0:19:a2	ORION TELE-EQUIPMENTS PVT LTD
+0:19:a3	asteel electronique atlantique
+0:19:a4	Austar Technology (hang zhou) Co.,Ltd
+0:19:a5	RadarFind Corporation
+0:19:a6	Motorola CHS
+0:19:a7	ITU-T
+0:19:a8	WiQuest Communications, Inc
+0:19:a9	Cisco Systems
+0:19:aa	Cisco Systems
+0:19:ab	Raycom CO ., LTD
+0:19:ac	GSP SYSTEMS Inc.
+0:19:ad	BOBST SA
+0:19:ae	Hopling Technologies b.v.
+0:19:af	Rigol Technologies, Inc.
 0:19:b	Southern Vision Systems, Inc.
+0:19:b0	HanYang System
+0:19:b1	Arrow7 Corporation
+0:19:b2	XYnetsoft Co.,Ltd
+0:19:b3	Stanford Research Systems
+0:19:b4	VideoCast Ltd.
+0:19:b5	Famar Fueguina S.A.
+0:19:b6	Euro Emme s.r.l.
+0:19:b7	Nokia Danmark A/S
+0:19:b8	Boundary Devices
+0:19:b9	Dell Inc.
+0:19:ba	Paradox Security Systems Ltd
+0:19:bb	Hewlett Packard
+0:19:bc	ELECTRO CHANCE SRL
+0:19:bd	New Media Life
+0:19:be	Altai Technologies Limited
+0:19:bf	Citiway technology Co.,ltd
 0:19:c	Encore Electronics, Inc.
+0:19:c0	Motorola Mobile Devices
+0:19:c1	Alps Electric Co., Ltd
+0:19:c2	Equustek Solutions, Inc.
+0:19:c3	Qualitrol
+0:19:c4	Infocrypt Inc.
+0:19:c5	SONY Computer Entertainment inc,
+0:19:c6	ZTE Corporation
+0:19:c7	Cambridge Industries(Group) Co.,Ltd.
+0:19:c8	AnyDATA Corporation
+0:19:c9	S&C ELECTRIC COMPANY
+0:19:ca	Broadata Communications, Inc
+0:19:cb	ZyXEL Communications Corporation
+0:19:cc	RCG (HK) Ltd
+0:19:cd	Chengdu ethercom information technology Ltd.
+0:19:ce	Progressive Gaming International
+0:19:cf	SALICRU, S.A.
 0:19:d	IEEE 1394c
+0:19:d0	Cathexis
+0:19:d1	Intel Corporation
+0:19:d2	Intel Corporation
+0:19:d3	TRAK Microwave
+0:19:d4	ICX Technologies
+0:19:d5	IP Innovations, Inc.
+0:19:d6	LS Cable Ltd.
+0:19:d7	FORTUNETEK CO., LTD
+0:19:d8	MAXFOR
+0:19:d9	Zeutschel GmbH
+0:19:da	Welltrans O&E Technology Co. , Ltd.
+0:19:db	MICRO-STAR INTERNATIONAL CO., LTD.
+0:19:dc	ENENSYS Technologies
+0:19:dd	FEI-Zyfer, Inc.
+0:19:de	MOBITEK
+0:19:df	THOMSON APDG
 0:19:e	Atech Technology Co., Ltd.
+0:19:e0	TP-LINK Technologies Co., Ltd.
+0:19:e1	Nortel
+0:19:e2	Juniper Networks
+0:19:e3	Apple Computers
+0:19:e4	2Wire, Inc
+0:19:e5	Lynx Studio Technology, Inc.
+0:19:e6	TOYO MEDIC CO.,LTD.
+0:19:e7	Cisco Systems
+0:19:e8	Cisco Systems
+0:19:e9	S-Information Technolgy, Co., Ltd.
+0:19:ea	TeraMage Technologies Co., Ltd.
+0:19:eb	Pyronix Ltd
+0:19:ec	Sagamore Systems, Inc.
+0:19:ed	Axesstel Inc.
+0:19:ee	CARLO GAVAZZI CONTROLS SPA-Controls Division
+0:19:ef	SHENZHEN LINNKING ELECTRONICS CO.,LTD
 0:19:f	Advansus Corp.
+0:19:f0	UNIONMAN TECHNOLOGY CO.,LTD
+0:19:f1	Star Communication Network Technology Co.,Ltd
+0:19:f2	Teradyne K.K.
+0:19:f3	Telematrix, Inc
+0:19:f4	Convergens Oy Ltd
+0:19:f5	Imagination Technologies Ltd
+0:19:f6	Acconet (PTE) Ltd
+0:19:f7	Onset Computer Corporation
+0:19:f8	Embedded Systems Design, Inc.
+0:19:f9	Lambda
+0:19:fa	Cable Vision Electronics CO., LTD.
+0:19:fb	AMSTRAD PLC
+0:19:fc	PT. Ufoakses Sukses Luarbiasa
+0:19:fd	Nintendo Co., Ltd.
+0:19:fe	SHENZHEN SEECOMM TECHNOLOGY CO.,LTD.
+0:19:ff	Finnzymes
 0:1:0	EQUIP'TRANS
 0:1:1	PRIVATE
 0:1:10	Gotham Networks
@@ -2841,6 +3069,469 @@
 0:1:fd	Digital Voice Systems, Inc.
 0:1:fe	DIGITAL EQUIPMENT CORPORATION
 0:1:ff	Data Direct Networks, Inc.
+0:1a:0	MATRIX INC.
+0:1a:1	Smiths Medical
+0:1a:10	LUCENT TRANS ELECTRONICS CO.,LTD
+0:1a:11	Google Inc.
+0:1a:12	PRIVATE
+0:1a:13	Wanlida Group Co., LTD
+0:1a:14	Xin Hua Control Engineering Co.,Ltd.
+0:1a:15	gemalto e-Payment
+0:1a:16	Nokia Danmark A/S
+0:1a:17	Teak Technologies, Inc.
+0:1a:18	Advanced Simulation Technology inc.
+0:1a:19	Computer Engineering Limited
+0:1a:1a	Gentex Corporation/Electro-Acoustic Products
+0:1a:1b	Motorola Mobile Devices
+0:1a:1c	GT&T Engineering Pte Ltd
+0:1a:1d	PChome Online Inc.
+0:1a:1e	Aruba Networks
+0:1a:1f	Coastal Environmental Systems
+0:1a:2	SECURE CARE PRODUCTS, INC
+0:1a:20	CMOTECH Co. Ltd.
+0:1a:21	Indac B.V.
+0:1a:22	eq-3 GmbH
+0:1a:23	Ice Qube, Inc
+0:1a:24	Galaxy Telecom Technologies Ltd
+0:1a:25	DELTA DORE
+0:1a:26	Deltanode Solutions AB
+0:1a:27	Ubistar
+0:1a:28	ASWT Co., LTD. Taiwan Branch H.K.
+0:1a:29	Techsonic Industries d/b/a Humminbird
+0:1a:2a	Arcadyan Technology Corporation
+0:1a:2b	Ayecom Technology Co., Ltd.
+0:1a:2c	SATEC Co.,LTD
+0:1a:2d	The Navvo Group
+0:1a:2e	Ziova Coporation
+0:1a:2f	Cisco Systems
+0:1a:3	Angel Electronics Co., Ltd.
+0:1a:30	Cisco Systems
+0:1a:31	SCAN COIN Industries AB
+0:1a:32	ACTIVA MULTIMEDIA
+0:1a:33	ASI Communications, Inc.
+0:1a:34	Konka Group Co., Ltd.
+0:1a:35	BARTEC GmbH
+0:1a:36	Actimon GmbH & Co. KG
+0:1a:37	Lear Corporation
+0:1a:38	SCI Technology
+0:1a:39	Merten GmbH&CoKG
+0:1a:3a	Dongahelecomm
+0:1a:3b	Doah Elecom Inc.
+0:1a:3c	Technowave Ltd.
+0:1a:3d	Ajin Vision Co.,Ltd
+0:1a:3e	Faster Technology LLC
+0:1a:3f	intelbras
+0:1a:4	Interay Solutions BV
+0:1a:40	A-FOUR TECH CO., LTD.
+0:1a:41	INOCOVA Co.,Ltd
+0:1a:42	Techcity Technology co., Ltd.
+0:1a:43	Logical Link Communications
+0:1a:44	JWTrading Co., Ltd
+0:1a:45	GN Netcom as
+0:1a:46	Digital Multimedia Technology Co., Ltd
+0:1a:47	Agami Systems, Inc.
+0:1a:48	Takacom Corporation
+0:1a:49	Micro Vision Co.,LTD
+0:1a:4a	Qumranet Inc.
+0:1a:4b	Hewlett Packard
+0:1a:4c	Crossbow Technology, Inc
+0:1a:4d	GIGABYTE TECHNOLOGY CO.,LTD.
+0:1a:4e	NTI AG / LinMot
+0:1a:4f	AVM GmbH
+0:1a:5	OPTIBASE LTD
+0:1a:50	PheeNet Technology Corp.
+0:1a:51	Alfred Mann Foundation
+0:1a:52	Meshlinx Wireless Inc.
+0:1a:53	Zylaya
+0:1a:54	Hip Shing Electronics Ltd.
+0:1a:55	ACA-Digital Corporation
+0:1a:56	ViewTel Co,. Ltd.
+0:1a:57	Matrix Design Group, LLC
+0:1a:58	Celectronic GmbH
+0:1a:59	Ircona
+0:1a:5a	Korea Electric Power Data Network  (KDN) Co., Ltd
+0:1a:5b	NetCare Service Co., Ltd.
+0:1a:5c	Euchner GmbH+Co. KG
+0:1a:5d	Mobinnova Corp.
+0:1a:5e	Thincom Technology Co.,Ltd
+0:1a:5f	KitWorks.fi Ltd.
+0:1a:6	OpVista, Inc.
+0:1a:60	Wave Electronics Co.,Ltd.
+0:1a:61	PacStar Corp.
+0:1a:62	trusted data
+0:1a:63	Elster Electricity, LLC
+0:1a:64	IBM Corp.
+0:1a:65	Seluxit
+0:1a:66	Motorola CHS
+0:1a:67	Infinite QL Sdn Bhd
+0:1a:68	Weltec Enterprise Co., Ltd.
+0:1a:69	Wuhan Yangtze Optical Technology CO.,Ltd.
+0:1a:6a	Tranzas, Inc.
+0:1a:6b	USI
+0:1a:6c	Cisco Systems
+0:1a:6d	Cisco Systems
+0:1a:6e	Impro Technologies
+0:1a:6f	MI.TEL s.r.l.
+0:1a:7	Arecont Vision
+0:1a:70	Cisco-Linksys, LLC
+0:1a:71	Diostech Co., Ltd.
+0:1a:72	Mosart Semiconductor Corp.
+0:1a:73	Gemtek Technology Co., Ltd.
+0:1a:74	Procare International Co
+0:1a:75	Sony Ericsson Mobile Communications
+0:1a:76	SDT information Technology Co.,LTD.
+0:1a:77	Motorola Mobile Devices
+0:1a:78	ubtos
+0:1a:79	TELECOMUNICATION TECHNOLOGIES LTD.
+0:1a:7a	Lismore Instruments Limited
+0:1a:7b	Teleco, Inc.
+0:1a:7c	Hirschmann Automation and Control B.V.
+0:1a:7d	cyber-blue(HK)Ltd
+0:1a:7e	LN Srithai Comm Ltd.
+0:1a:7f	GCI Science&Technology Co.,Ltd.
+0:1a:8	Dalman Technical Services
+0:1a:80	Sony Corporation
+0:1a:81	Zelax
+0:1a:82	PROBA Building Automation Co.,LTD
+0:1a:83	Pegasus Technologies Inc.
+0:1a:84	V One Multimedia Pte Ltd
+0:1a:85	NV Michel Van de Wiele
+0:1a:86	AdvancedIO Systems Inc
+0:1a:87	Canhold International Limited
+0:1a:88	Venergy,Co,Ltd
+0:1a:89	Nokia Danmark A/S
+0:1a:8a	Samsung Electronics Co., Ltd.
+0:1a:8b	CHUNIL ELECTRIC IND., CO.
+0:1a:8c	Astaro AG
+0:1a:8d	AVECS Bergen GmbH
+0:1a:8e	3Way Networks Ltd
+0:1a:8f	Nortel
+0:1a:9	Wayfarer Transit Systems Ltd
+0:1a:90	Trópico Sistemas e Telecomunicações da Amazônia LTDA.
+0:1a:91	FusionDynamic Ltd.
+0:1a:92	ASUSTek COMPUTER INC.
+0:1a:93	ERCO Leuchten GmbH
+0:1a:94	Votronic GmbH
+0:1a:95	Hisense Mobile Communications Technoligy Co.,Ltd.
+0:1a:96	ECLER S.A.
+0:1a:97	fitivision technology Inc.
+0:1a:98	Asotel Communication Limited Taiwan Branch
+0:1a:99	Smarty (HZ) Information Electronics Co., Ltd
+0:1a:9a	Skyworth Digital technology(shenzhen)co.ltd.
+0:1a:9b	ADEC & Parter AG
+0:1a:9c	RightHand Technologies, Inc.
+0:1a:9d	Skipper Wireless, Inc.
+0:1a:9e	ICON Digital International Limited
+0:1a:9f	A-Link Europe Ltd
+0:1a:a	Adaptive Micro-Ware Inc.
+0:1a:a0	Dell Inc
+0:1a:a1	Cisco Systems
+0:1a:a2	Cisco Systems
+0:1a:a3	DELORME
+0:1a:a4	Future University-Hakodate
+0:1a:a5	BRN Phoenix
+0:1a:a6	Telefunken Radio Communication Systems GmbH &CO.KG
+0:1a:a7	Torian Wireless
+0:1a:a8	Mamiya Digital Imaging Co., Ltd.
+0:1a:a9	FUJIAN STAR-NET COMMUNICATION CO.,LTD
+0:1a:aa	Analogic Corp.
+0:1a:ab	eWings s.r.l.
+0:1a:ac	Corelatus AB
+0:1a:ad	Motorola CHS
+0:1a:ae	Savant Systems LLC
+0:1a:af	BLUSENS TECHNOLOGY
+0:1a:b	BONA TECHNOLOGY INC.
+0:1a:b0	Signal Networks Pvt. Ltd.,
+0:1a:b1	Asia Pacific Satellite Industries Co., Ltd.
+0:1a:b2	Cyber Solutions Inc.
+0:1a:b3	VISIONITE INC.
+0:1a:b4	FFEI Ltd.
+0:1a:b5	Home Network System
+0:1a:b6	Luminary Micro Inc
+0:1a:b7	Ethos Networks LTD.
+0:1a:b8	Anseri Corporation
+0:1a:b9	PMC
+0:1a:ba	Caton Overseas Limited
+0:1a:bb	Fontal Technology Incorporation
+0:1a:bc	U4EA Technologies Ltd
+0:1a:bd	Impatica Inc.
+0:1a:be	COMPUTER HI-TECH INC.
+0:1a:bf	TRUMPF Laser Marking Systems AG
+0:1a:c	Swe-Dish Satellite Systems AB
+0:1a:c0	JOYBIEN TECHNOLOGIES CO., LTD.
+0:1a:c1	3COM EUROPE
+0:1a:c2	YEC Co.,Ltd.
+0:1a:c3	Scientific-Atlanta, Inc
+0:1a:c4	2Wire, Inc
+0:1a:c5	BreakingPoint Systems, Inc.
+0:1a:c6	Micro Control Designs
+0:1a:c7	UNIPOINT
+0:1a:c8	ISL (Instrumentation Scientifique de Laboratoire)
+0:1a:c9	SUZUKEN CO.,LTD
+0:1a:ca	Tilera Corporation
+0:1a:cb	Autocom Products Ltd
+0:1a:cc	Celestial Semiconductor, Ltd
+0:1a:cd	Tidel Engineering LP
+0:1a:ce	YUPITERU INDUSTRIES CO., LTD.
+0:1a:cf	C.T. ELETTRONICA
+0:1a:d	HandHeld entertainment, Inc.
+0:1a:d0	Siemens Schweiz AG
+0:1a:d1	FARGO CO., LTD.
+0:1a:d2	Eletronica Nitron Ltda
+0:1a:d3	Vamp Ltd.
+0:1a:d4	iPOX Technology Co., Ltd.
+0:1a:d5	KMC CHAIN INDUSTRIAL CO., LTD.
+0:1a:d6	JIAGNSU AETNA ELECTRIC CO.,LTD
+0:1a:d7	Christie Digital Systems, Inc.
+0:1a:d8	AlsterAero GmbH
+0:1a:d9	International Broadband Electric Communications, Inc.
+0:1a:da	Biz-2-Me Inc.
+0:1a:db	Motorola Mobile Devices
+0:1a:dc	Nokia Danmark A/S
+0:1a:dd	PePWave Ltd
+0:1a:de	Motorola CHS
+0:1a:df	Interactivetv Pty Limited
+0:1a:e	Cheng Uei Precision Industry Co.,Ltd
+0:1a:e0	Mythology Tech Express Inc.
+0:1a:e1	EDGE ACCESS INC
+0:1a:e2	Cisco Systems
+0:1a:e3	Cisco Systems
+0:1a:e4	Liposonix Inc,
+0:1a:e5	Mvox Technologies Inc.
+0:1a:e6	Atlanta Advanced Communications Holdings Limited
+0:1a:e7	Aztek Networks, Inc.
+0:1a:e8	Siemens Enterprise Communications GmbH & Co. KG
+0:1a:e9	Nintendo Co., Ltd.
+0:1a:ea	Radio Terminal Systems Pty Ltd
+0:1a:eb	Allied Telesis K.K.
+0:1a:ec	Keumbee Electronics Co.,Ltd.
+0:1a:ed	INCOTEC GmbH
+0:1a:ee	Shenztech Ltd
+0:1a:ef	Loopcomm Technology, Inc.
+0:1a:f	Sistemas Avanzados de Control, S.A.
+0:1a:f0	Alcatel - IPD
+0:1a:f1	Embedded Artists AB
+0:1a:f2	Dynavisions GmbH
+0:1a:f3	Samyoung Electronics
+0:1a:f4	Handreamnet
+0:1a:f5	PENTAONE. CO., LTD.
+0:1a:f6	Woven Systems, Inc.
+0:1a:f7	dataschalt e+a GmbH
+0:1a:f8	Copley Controls Corporation
+0:1a:f9	AeroVIronment (AV Inc)
+0:1a:fa	Welch Allyn, Inc.
+0:1a:fb	Joby Inc.
+0:1a:fc	ModusLink Corporation
+0:1a:fd	EVOLIS
+0:1a:fe	SOFACREAL
+0:1a:ff	Wizyoung Tech.
+0:1b:0	Neopost Technologies
+0:1b:1	Applied Radio Technologies
+0:1b:10	ShenZhen Kang Hui Technology Co.,ltd
+0:1b:11	D-Link Corporation
+0:1b:12	Apprion
+0:1b:13	Icron Technologies Corporation
+0:1b:14	Carex Lighting Equipment Factory
+0:1b:15	Voxtel, Inc.
+0:1b:16	Celtro Ltd.
+0:1b:17	Palo Alto Networks
+0:1b:18	Tsuken Electric Ind. Co.,Ltd
+0:1b:19	IEEE 1588 Standard
+0:1b:1a	e-trees Japan, Inc.
+0:1b:1b	Siemens AG, A&D AS EWK PU1
+0:1b:1c	Coherent
+0:1b:1d	Phoenix International Co., Ltd
+0:1b:1e	HART Communication Foundation
+0:1b:1f	DELTA - Danish Electronics, Light & Acoustics
+0:1b:2	ED Co.Ltd
+0:1b:20	TPine Technology
+0:1b:21	Intel Corporate
+0:1b:22	Palit Microsystems ( H.K.) Ltd.
+0:1b:23	SimpleComTools
+0:1b:24	Quanta Computer Inc.
+0:1b:25	Nortel
+0:1b:26	RON-Telecom ZAO
+0:1b:27	Merlin CSI
+0:1b:28	POLYGON, JSC
+0:1b:29	Avantis.Co.,Ltd
+0:1b:2a	Cisco Systems
+0:1b:2b	Cisco Systems
+0:1b:2c	ATRON electronic GmbH
+0:1b:2d	PRIVATE
+0:1b:2e	Sinkyo Electron Inc
+0:1b:2f	NETGEAR Inc.
+0:1b:3	Action Technology (SZ) Co., Ltd
+0:1b:30	Solitech Inc.
+0:1b:31	Neural Image. Co. Ltd.
+0:1b:32	QLogic Corporation
+0:1b:33	Nokia Danmark A/S
+0:1b:34	Focus System Inc.
+0:1b:35	ChongQing JINOU Science & Technology Development CO.,Ltd
+0:1b:36	Tsubata Engineering Co.,Ltd. (Head Office)
+0:1b:37	Computec Oy
+0:1b:38	COMPAL ELECTRONICS TECHNOLOGIC CO., LTD.
+0:1b:39	Proxicast
+0:1b:3a	SIMS Corp.
+0:1b:3b	Yi-Qing CO., LTD
+0:1b:3c	Software Technologies Group,Inc.
+0:1b:3d	EuroTel Spa
+0:1b:3e	Curtis, Inc.
+0:1b:3f	ProCurve Networking by HP
+0:1b:4	Affinity International S.p.a
+0:1b:40	Network Automation mxc AB
+0:1b:41	General Infinity Co.,Ltd.
+0:1b:42	Wise & Blue
+0:1b:43	Beijing DG Telecommunications equipment Co.,Ltd
+0:1b:44	SanDisk Corporation
+0:1b:45	ABB AS, Division Automation Products
+0:1b:46	Blueone Technology Co.,Ltd
+0:1b:47	Futarque A/S
+0:1b:48	Shenzhen Lantech Electronics Co., Ltd.
+0:1b:49	Roberts Radio limited
+0:1b:4a	W&W Communications, Inc.
+0:1b:4b	SANION Co., Ltd.
+0:1b:4c	Signtech
+0:1b:4d	Areca Technology Corporation
+0:1b:4e	Navman New Zealand
+0:1b:4f	Avaya Inc.
+0:1b:5	Young Media Concepts GmbH
+0:1b:50	Nizhny Novgorod Factory named after M.Frunze, FSUE (NZiF)
+0:1b:51	Vector Technology Corp.
+0:1b:52	Motorola Mobile Devices
+0:1b:53	Cisco Systems
+0:1b:54	Cisco Systems
+0:1b:55	Hurco Automation Ltd.
+0:1b:56	Tehuti Networks Ltd.
+0:1b:57	SEMINDIA SYSTEMS PRIVATE LIMITED
+0:1b:58	PRIVATE
+0:1b:59	Sony Ericsson Mobile Communications AB
+0:1b:5a	Apollo Imaging Technologies, Inc.
+0:1b:5b	2Wire, Inc.
+0:1b:5c	Azuretec Co., Ltd.
+0:1b:5d	Vololink Pty Ltd
+0:1b:5e	BPL Limited
+0:1b:5f	Alien Technology
+0:1b:6	Ateliers R. LAUMONIER
+0:1b:60	NAVIGON AG
+0:1b:61	Digital Acoustics, LLC
+0:1b:62	JHT Optoelectronics Co.,Ltd.
+0:1b:63	Apple Inc.
+0:1b:64	IsaacLandKorea
+0:1b:65	China Gridcom Co., Ltd
+0:1b:66	Sennheiser electronic GmbH & Co. KG
+0:1b:67	Ubiquisys Ltd
+0:1b:68	Modnnet Co., Ltd
+0:1b:69	Equaline Corporation
+0:1b:6a	Powerwave UK Ltd
+0:1b:6b	Swyx Solutions AG
+0:1b:6c	LookX Digital Media BV
+0:1b:6d	Midtronics, Inc.
+0:1b:6e	Anue Systems, Inc.
+0:1b:6f	Teletrak Ltd
+0:1b:7	Mendocino Software
+0:1b:70	IRI Ubiteq, INC.
+0:1b:71	Telular Corp.
+0:1b:72	Sicep s.p.a.
+0:1b:73	DTL Broadcast Ltd
+0:1b:74	MiraLink Corporation
+0:1b:75	Hypermedia Systems
+0:1b:76	Ripcode, Inc.
+0:1b:77	Intel Corporate
+0:1b:78	Hewlett Packard
+0:1b:79	FAIVELEY TRANSPORT
+0:1b:7a	Nintendo Co., Ltd.
+0:1b:7b	The Tintometer Ltd
+0:1b:7c	A & R Cambridge
+0:1b:7d	CXR Anderson Jacobson
+0:1b:7e	Beckmann GmbH
+0:1b:7f	TMN Technologies Telecomunicacoes Ltda
+0:1b:8	Danfoss Drives A/S
+0:1b:80	LORD Corporation
+0:1b:81	DATAQ Instruments, Inc.
+0:1b:82	Taiwan Semiconductor Co., Ltd.
+0:1b:83	Finsoft Ltd
+0:1b:84	Scan Engineering Telecom
+0:1b:85	MAN Diesel A/S
+0:1b:86	Bosch Access Systems GmbH
+0:1b:87	Deepsound Tech. Co., Ltd
+0:1b:88	Divinet Access Technologies Ltd
+0:1b:89	EMZA Visual Sense Ltd.
+0:1b:8a	2M Electronic A/S
+0:1b:8b	NEC AccessTechnica,Ltd.
+0:1b:8c	JMicron Technology Corp.
+0:1b:8d	Electronic Computer Systems, Inc.
+0:1b:8e	Hulu Sweden AB
+0:1b:8f	Cisco Systems
+0:1b:9	Matrix Telecom Pvt. Ltd.
+0:1b:90	Cisco Systems
+0:1b:91	EFKON AG
+0:1b:92	l-acoustics
+0:1b:93	JC Decaux SA DNT
+0:1b:94	T.E.M.A. S.p.A.
+0:1b:95	VIDEO SYSTEMS SRL
+0:1b:96	Snif Labs, Inc.
+0:1b:97	Violin Technologies
+0:1b:98	Samsung Electronics Co., Ltd.
+0:1b:99	KS System GmbH
+0:1b:9a	Apollo Fire Detectors Ltd
+0:1b:9b	Hose-McCann Communications
+0:1b:9c	SATEL sp. z o.o.
+0:1b:9d	Novus Security Sp. z o.o.
+0:1b:9e	ASKEY  COMPUTER  CORP
+0:1b:9f	Calyptech Pty Ltd
+0:1b:a	Intelligent Distributed Controls Ltd
+0:1b:a0	Awox
+0:1b:a1	Åmic AB
+0:1b:a2	IDS Imaging Development Systems GmbH
+0:1b:a3	Flexit Group GmbH
+0:1b:a4	S.A.E Afikim
+0:1b:a5	MyungMin Systems, Inc.
+0:1b:a6	intotech inc.
+0:1b:a7	Lorica Solutions
+0:1b:a8	UBI&MOBI,.Inc
+0:1b:a9	BROTHER INDUSTRIES, LTD.
+0:1b:aa	XenICs nv
+0:1b:ab	Telchemy, Incorporated
+0:1b:ac	Curtiss Wright Controls Embedded Computing
+0:1b:ad	iControl Incorporated
+0:1b:ae	Micro Control Systems, Inc
+0:1b:af	Nokia Danmark A/S
+0:1b:b	Phidgets Inc.
+0:1b:b0	BHARAT ELECTRONICS
+0:1b:b1	Wistron Neweb Corp.
+0:1b:b2	Intellect International NV
+0:1b:b3	Condalo GmbH
+0:1b:b4	Airvod Limited
+0:1b:b5	Cherry GmbH
+0:1b:b6	Bird Electronic Corp.
+0:1b:b7	Alta Heights Technology Corp.
+0:1b:b8	BLUEWAY ELECTRONIC CO;LTD
+0:1b:b9	Elitegroup Computer System Co.
+0:1b:ba	Nortel
+0:1b:bb	RFTech Co.,Ltd
+0:1b:bc	Silver Peak Systems, Inc.
+0:1b:bd	FMC Kongsberg Subsea AS
+0:1b:be	ICOP Digital
+0:1b:bf	SAGEM COMMUNICATION
+0:1b:c	Cisco Systems
+0:1b:c0	Juniper Networks
+0:1b:c1	HOLUX Technology, Inc.
+0:1b:c2	Integrated Control Technology Limitied
+0:1b:c3	Mobisolution Co.,Ltd
+0:1b:c4	Ultratec, Inc.
+0:1b:c5	IEEE Registration Authority
+0:1b:c6	Strato Rechenzentrum AG
+0:1b:c7	StarVedia Technology Inc.
+0:1b:c8	MIURA CO.,LTD
+0:1b:c9	FSN DISPLAY INC
+0:1b:ca	Beijing Run Technology LTD. Company
+0:1b:cb	PEMPEK SYSTEMS PTY LTD
+0:1b:cc	KINGTEK CCTV ALLIANCE CO., LTD.
+0:1b:cd	DAVISCOMMS (S) PTE LTD
+0:1b:ce	Measurement Devices Ltd
+0:1b:d	Cisco Systems
+0:1b:e	InoTec GmbH Organisationssysteme
+0:1b:f	Petratec
 0:1c:7c	PERQ SYSTEMS CORPORATION
 0:20:0	LEXMARK INTERNATIONAL, INC.
 0:20:1	DSP SOLUTIONS, INC.
@@ -3187,7 +3878,7 @@
 0:2:5f	Nortel Networks
 0:2:6	Telital R&D Denmark A/S
 0:2:60	Accordion Networks, Inc.
-0:2:61	i3 Micro Technology AB
+0:2:61	Tilgin AB
 0:2:62	Soyo Group Soyo Com Tech Co., Ltd
 0:2:63	UPS Manufacturing SRL
 0:2:64	AudioRamp.com
@@ -3584,7 +4275,7 @@
 0:30:e3	SEDONA NETWORKS CORP.
 0:30:e4	CHIYODA SYSTEM RIKEN
 0:30:e5	Amper Datos S.A.
-0:30:e6	SIEMENS MEDICAL SYSTEMS
+0:30:e6	Draeger Medical Systems, Inc.
 0:30:e7	CNF MOBILE SOLUTIONS, INC.
 0:30:e8	ENSIM CORP.
 0:30:e9	GMA COMMUNICATION MANUFACT'G
@@ -3759,7 +4450,7 @@
 0:3:97	Watchfront Electronics
 0:3:98	WISI
 0:3:99	Dongju Informations & Communications Co., Ltd.
-0:3:9a	nSine, Ltd.
+0:3:9a	SiConnect
 0:3:9b	NetChip Technology, Inc.
 0:3:9c	OptiMight Communications, Inc.
 0:3:9d	BENQ CORPORATION
@@ -4137,7 +4828,7 @@
 0:4:17	ELAU AG
 0:4:18	Teltronic S.A.U.
 0:4:19	Fibercycle Networks, Inc.
-0:4:1a	ines GmbH
+0:4:1a	Ines Test and Measurement GmbH & CoKG
 0:4:1b	Digital Interfaces Ltd.
 0:4:1c	ipDialog, Inc.
 0:4:1d	Corega of America
@@ -4428,8 +5119,8 @@
 0:50:3e	CISCO SYSTEMS, INC.
 0:50:3f	ANCHOR GAMES
 0:50:4	3COM CORPORATION
-0:50:40	Panasonic Electric Works Laboratory of America, Inc./SLC Lab
-0:50:41	CTX OPTO ELECTRONIC CORP.
+0:50:40	Matsushita Electric Works, Ltd.
+0:50:41	Coretronic Corporation
 0:50:42	SCI MANUFACTURING SINGAPORE PTE, LTD.
 0:50:43	MARVELL SEMICONDUCTOR, INC.
 0:50:44	ASACA CORPORATION
@@ -4919,7 +5610,7 @@
 0:60:34	ROBERT BOSCH GmbH
 0:60:35	DALLAS SEMICONDUCTOR, INC.
 0:60:36	AUSTRIAN RESEARCH CENTER SEIBERSDORF
-0:60:37	PHILIPS SEMICONDUCTORS
+0:60:37	NXP Semiconductors
 0:60:38	Nortel Networks
 0:60:39	SanCom Technology, Inc.
 0:60:3a	QUICK CONTROLS LTD.
@@ -5334,7 +6025,7 @@
 0:6:ca	American Computer & Digital Components, Inc. (ACDC)
 0:6:cb	Jotron Electronics A/S
 0:6:cc	JMI Electronics Co., Ltd.
-0:6:cd	Creo IL. Ltd.
+0:6:cd	Kodak IL Ltd.
 0:6:ce	DATENO
 0:6:cf	Thales Avionics In-Flight Systems, LLC
 0:6:d	Wave7 Optics
@@ -5444,7 +6135,7 @@
 0:7:43	Chelsio Communications
 0:7:44	Unico, Inc.
 0:7:45	Radlan Computer Communications Ltd.
-0:7:46	Interlink BT, LLC
+0:7:46	TURCK, Inc.
 0:7:47	Mecalc
 0:7:48	The Imaging Source Europe
 0:7:49	CENiX Inc.
@@ -5469,7 +6160,7 @@
 0:7:5b	Gibson Guitars
 0:7:5c	Eastman Kodak Company
 0:7:5d	Celleritas Inc.
-0:7:5e	Pulsar Technologies, Inc.
+0:7:5e	Ametek Power Instruments
 0:7:5f	VCS Video Communication Systems AG
 0:7:6	Sanritz Corporation
 0:7:60	TOMIS Information & Telecom Corp.
@@ -6119,7 +6810,7 @@
 0:8:fc	Gigaphoton Inc.
 0:8:fd	BlueKorea Co., Ltd.
 0:8:fe	UNIK C&C Co.,Ltd.
-0:8:ff	Trilogy Broadcast (Holdings) Ltd
+0:8:ff	Trilogy Communications Ltd
 0:90:0	DIAMOND MULTIMEDIA
 0:90:1	NISHIMU ELECTRONICS INDUSTRIES CO., LTD.
 0:90:10	SIMULATION LABORATORIES, INC.
@@ -6325,7 +7016,7 @@
 0:90:cd	ENT-EMPRESA NACIONAL DE TELECOMMUNICACOES, S.A.
 0:90:ce	TETRA GmbH
 0:90:cf	NORTEL
-0:90:d	OVERLAND DATA INC.
+0:90:d	Overland Storage Inc.
 0:90:d0	Thomson Telecom Belgium
 0:90:d1	LEICHU ENTERPRISE CO., LTD.
 0:90:d2	ARTEL VIDEO SYSTEMS
@@ -6511,7 +7202,7 @@
 0:9:8a	EqualLogic Inc
 0:9:8b	Entropic Communications, Inc.
 0:9:8c	Option Wireless Sweden
-0:9:8d	DCT Ltd (Digital Communication Technologies Ltd)
+0:9:8d	Velocity Semiconductor
 0:9:8e	ipcas GmbH
 0:9:8f	Cetacean Networks
 0:9:9	Telenor Connect A/S
@@ -6787,7 +7478,7 @@
 0:a0:9d	JOHNATHON FREEMAN TECHNOLOGIES
 0:a0:9e	ICTV
 0:a0:9f	COMMVISION CORP.
-0:a0:a	R.D.C. COMMUNICATION
+0:a0:a	Airspan
 0:a0:a0	COMPACT DATA, LTD.
 0:a0:a1	EPIC DATA INC.
 0:a0:a2	DIGICOM S.P.A.
@@ -6928,7 +7619,7 @@
 0:a:30	Johnson Controls-ASG
 0:a:31	HCV Wireless
 0:a:32	Xsido Corporation
-0:a:33	Sierra Logic, Inc.
+0:a:33	Emulex Corporation
 0:a:34	Identicard Systems Incorporated
 0:a:35	Xilinx
 0:a:36	Synelec Telecom Multimedia
@@ -7230,7 +7921,7 @@
 0:b:37	MANUFACTURE DES MONTRES ROLEX SA
 0:b:38	Knuerr AG
 0:b:39	Keisoku Giken Co.,Ltd.
-0:b:3a	Fortel DTV, Inc.
+0:b:3a	QuStream Corporation
 0:b:3b	devolo AG
 0:b:3c	Cygnal Integrated Products, Inc.
 0:b:3d	CONTAL OK Ltd.
@@ -7579,7 +8270,7 @@
 0:c0:8c	PERFORMANCE TECHNOLOGIES, INC.
 0:c0:8d	TRONIX PRODUCT DEVELOPMENT
 0:c0:8e	NETWORK INFORMATION TECHNOLOGY
-0:c0:8f	MATSUSHITA ELECTRIC WORKS, LTD
+0:c0:8f	Matsushita Electric Works, Ltd.
 0:c0:9	KT TECHNOLOGY (S) PTE LTD
 0:c0:90	PRAIM S.R.L.
 0:c0:91	JABIL CIRCUIT, INC.
@@ -7621,7 +8312,7 @@
 0:c0:b3	COMSTAT DATACOMM CORPORATION
 0:c0:b4	MYSON TECHNOLOGY, INC.
 0:c0:b5	CORPORATE NETWORK SYSTEMS,INC.
-0:c0:b6	Snap Appliance, Inc.
+0:c0:b6	Adaptec, Inc.
 0:c0:b7	AMERICAN POWER CONVERSION CORP
 0:c0:b8	FRASER'S HILL LTD.
 0:c0:b9	FUNK SOFTWARE, INC.
@@ -7794,7 +8485,7 @@
 0:c:65	Sunin Telecom
 0:c:66	Pronto Networks Inc
 0:c:67	OYO ELECTRIC CO.,LTD
-0:c:68	Oasis Semiconductor, Inc.
+0:c:68	SigmaTel, Inc.
 0:c:69	National Radio Astronomy Observatory
 0:c:6a	MBARI
 0:c:6b	Kurz Industrie-Elektronik GmbH
@@ -8067,7 +8758,7 @@
 0:d0:73	ACN ADVANCED COMMUNICATIONS
 0:d0:74	TAQUA SYSTEMS, INC.
 0:d0:75	ALARIS MEDICAL SYSTEMS, INC.
-0:d0:76	MERRILL LYNCH & CO., INC.
+0:d0:76	Merrill Lynch & Co., Inc.
 0:d0:77	LUCENT TECHNOLOGIES
 0:d0:78	ELTEX OF SWEDEN AB
 0:d0:79	CISCO SYSTEMS, INC.
@@ -8231,7 +8922,7 @@
 0:d:1d	HIGH-TEK HARNESS ENT. CO., LTD.
 0:d:1e	Control Techniques
 0:d:1f	AV Digital
-0:d:2	NEC Access Technica,Ltd
+0:d:2	NEC AccessTechnica,Ltd
 0:d:20	ASAHIKASEI TECHNOSYSTEM CO.,LTD.
 0:d:21	WISCORE Inc.
 0:d:22	Unitronics
@@ -8777,7 +9468,7 @@
 0:e:2d	Hyundai Digital Technology Co.,Ltd.
 0:e:2e	Edimax Technology Co., Ltd.
 0:e:2f	Disetronic Medical Systems AG
-0:e:3	Aarohi Communications, Inc.
+0:e:3	Emulex
 0:e:30	AERAS Networks, Inc.
 0:e:31	Olympus BioSystems GmbH
 0:e:32	Kontron Medical
@@ -9071,7 +9762,7 @@
 0:f:50	Baxall Limited
 0:f:51	Azul Systems, Inc.
 0:f:52	YORK Refrigeration, Marine & Controls
-0:f:53	Level 5 Networks, Inc.
+0:f:53	Solarflare Communications Inc
 0:f:54	Entrelogic Corporation
 0:f:55	Datawire Communication Networks Inc.
 0:f:56	Continuum Photonics Inc
@@ -9116,7 +9807,7 @@
 0:f:7b	Arce Sistemas, S.A.
 0:f:7c	ACTi Corporation
 0:f:7d	Xirrus
-0:f:7e	UIS Abler Electronics Co.,Ltd.
+0:f:7e	Ablerex Electronics Co., LTD
 0:f:7f	UBSTORAGE Co.,Ltd.
 0:f:8	Indagon Oy
 0:f:80	Trinity Security Systems,Inc.
@@ -9149,7 +9840,7 @@
 0:f:9a	Synchrony, Inc.
 0:f:9b	Ross Video Limited
 0:f:9c	Panduit Corp
-0:f:9d	Newnham Research Ltd
+0:f:9d	DisplayLink (UK) Ltd
 0:f:9e	Murrelektronik GmbH
 0:f:9f	Motorola BCS
 0:f:a	Clear Edge Networks
@@ -9181,7 +9872,7 @@
 0:f:b8	CallURL Inc.
 0:f:b9	Adaptive Instruments
 0:f:ba	Tevebox AB
-0:f:bb	Siemens AG, ICN M&L TDC EP
+0:f:bb	Siemens Networks GmbH & Co. KG
 0:f:bc	Onkey Technologies, Inc.
 0:f:bd	MRV Communications (Networks) LTD
 0:f:be	e-w/you Inc.
diff --git a/mkdep b/mkdep
index 2a9c221..9609aa7 100755
--- a/mkdep
+++ b/mkdep
@@ -46,20 +46,19 @@ if [ $# = 0 ] ; then
 	exit 1
 fi
 
-if [ ! -w $MAKE ]; then
+if [ ! -w "$MAKE" ]; then
 	echo "mkdep: no writeable file \"$MAKE\""
 	exit 1
 fi
 
-TMP=/tmp/mkdep$$
+TMP="$(mktemp -t mkdep.XXXXXXXX)" || exit
+trap 'rc=$?; trap - 0; rm -f -- "$TMP"; exit $rc' EXIT HUP PIPE INT QUIT TERM
 
-trap 'rm -f $TMP ; exit 1' 1 2 3 13 15
+cp "$MAKE" "${MAKE}.bak"
 
-cp $MAKE ${MAKE}.bak
+sed -e '/DO NOT DELETE THIS LINE/,$d' < "$MAKE" > "$TMP"
 
-sed -e '/DO NOT DELETE THIS LINE/,$d' < $MAKE > $TMP
-
-cat << _EOF_ >> $TMP
+cat << _EOF_ >> "$TMP"
 # DO NOT DELETE THIS LINE -- mkdep uses it.
 # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
 
@@ -96,14 +95,14 @@ awk '{
 }
 END {
 	print rec
-}' >> $TMP
+}' >> "$TMP"
 
-cat << _EOF_ >> $TMP
+cat << _EOF_ >> "$TMP"
 
 # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
 _EOF_
 
 # copy to preserve permissions
-cp $TMP $MAKE
-rm -f ${MAKE}.bak $TMP
+cp "$TMP" "$MAKE"
+rm -f "${MAKE}.bak"
 exit 0
diff --git a/report.c b/report.c
index b305173..3fd4036 100644
--- a/report.c
+++ b/report.c
@@ -70,6 +70,9 @@ struct rtentry;
 
 #define PLURAL(n) ((n) == 1 || (n) == -1 ? "" : "s")
 
+char *watcher = WATCHER;
+char *watchee = WATCHEE;
+
 static int cdepth;	/* number of outstanding children */
 
 static char *fmtdate(time_t);
@@ -240,8 +243,6 @@ report(register char *title, register u_int32_t a, register u_char *e1,
 	register FILE *f;
 	char tempfile[64], cpu[64], os[64];
 	char *fmt = "%20s: %s\n";
-	char *watcher = WATCHER;
-	char *watchee = WATCHEE;
 	char *sendmail = PATH_SENDMAIL;
 	char *unknown = "<unknown>";
 	char buf[132];
@@ -258,6 +259,9 @@ report(register char *title, register u_int32_t a, register u_char *e1,
 		}
 		f = stdout;
 		(void)putc('\n', f);
+	} else if (watcher == NULL || *watcher == 0 || *watcher == '-') {
+		dosyslog(LOG_NOTICE, title, a, e1, e2);
+		return;
 	} else {
 		/* Setup child reaper if we haven't already */
 		if (!init) {
diff --git a/util.c b/util.c
index 4794a36..a997bfc 100644
--- a/util.c
+++ b/util.c
@@ -31,6 +31,7 @@ static const char rcsid[] =
 #include <sys/file.h>
 
 #include <fcntl.h>
+#include <errno.h>
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
 #endif