diff --git a/src/etc/ftpusers b/src/etc/ftpusers
index cea4f83b..82abead4 100644
--- a/src/etc/ftpusers
+++ b/src/etc/ftpusers
@@ -1,4 +1,4 @@
-#	$OpenBSD: ftpusers,v 1.24 2004/05/30 17:03:28 henning Exp $
+#	$OpenBSD: ftpusers,v 1.25 2004/11/24 18:50:41 henning Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
@@ -35,3 +35,4 @@ _rbootd
 _afs
 _ppp
 _ntp
+_ftp
diff --git a/src/etc/group b/src/etc/group
index 38afe24d..eb077dda 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -48,6 +48,7 @@ _rbootd:*:80:
 _afs:*:81:
 _ppp:*:82:
 _ntp:*:83:
+_ftp:*:84:
 dialer:*:117:
 nogroup:*:32766:
 nobody:*:32767:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index 1b1964c7..f3e09916 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.15 2004/05/30 17:03:29 henning Exp $
+#	$OpenBSD: aliases,v 1.16 2004/11/24 18:50:41 henning Exp $
 #
 #  Aliases in this file will NOT be expanded in the header from
 #  Mail, but WILL be visible over networks or from /usr/libexec/mail.local.
@@ -25,6 +25,7 @@ _afs: /dev/null
 _bgpd: /dev/null
 _dhcp: /dev/null
 _fingerd: /dev/null
+_ftp: /dev/null
 _identd: /dev/null
 _isakmpd: /dev/null
 _kadmin: /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index e1dfc536..582b339a 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -30,4 +30,5 @@ _rbootd:*:80:80::0:0:rbootd Daemon:/var/empty:/sbin/nologin
 _afs:*:81:81::0:0:afs Daemon:/var/empty:/sbin/nologin
 _ppp:*:82:82::0:0:PPP utilities:/var/empty:/sbin/nologin
 _ntp:*:83:83::0:0:NTP Daemon:/var/empty:/sbin/nologin
+_ftp:*:84:84::0:0:FTP Daemon:/var/empty:/sbin/nologin
 nobody:*:32767:32767::0:0:Unprivileged user:/nonexistent:/sbin/nologin