diff --git a/src/etc/group b/src/etc/group
index c0f8a943..9c20d919 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -40,6 +40,7 @@ authpf:*:72:
 _syslogd:*:73:
 _pflogd:*:74:
 _bgpd:*:75:
+_tcpdump:*:76:
 dialer:*:117:
 nogroup:*:32766:
 nobody:*:32767:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index 24420202..7109fd85 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.4 2003/12/17 19:42:33 henning Exp $
+#	$OpenBSD: aliases,v 1.5 2004/01/19 10:05:46 deraadt Exp $
 #
 #  Aliases in this file will NOT be expanded in the header from
 #  Mail, but WILL be visible over networks or from /bin/mail.
@@ -21,6 +21,7 @@ uucp:	root
 www:	root
 
 # Redirections for pseudo accounts that should not receive mail
+_tcpdump: /dev/null
 _bgpd: /dev/null
 _fingerd: /dev/null
 _identd: /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 36ec5080..3a2cbac6 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -22,4 +22,5 @@ proxy:*:71:71::0:0:Proxy Services:/nonexistent:/sbin/nologin
 _syslogd:*:73:73::0:0:Syslog Daemon:/var/empty:/sbin/nologin
 _pflogd:*:74:74::0:0:pflogd privsep:/var/empty:/sbin/nologin
 _bgpd:*:75:75::0:0:BGP Daemon:/var/empty:/sbin/nologin
+_tcpdump:*:76:76::0:0:tcpdump:/var/empty:/sbin/nologin
 nobody:*:32767:32767::0:0:Unprivileged user:/nonexistent:/sbin/nologin