diff --git a/src/etc/ftpusers b/src/etc/ftpusers
index 86fa6685..732de528 100644
--- a/src/etc/ftpusers
+++ b/src/etc/ftpusers
@@ -1,4 +1,4 @@
-#	$OpenBSD: ftpusers,v 1.22 2004/05/06 16:49:02 deraadt Exp $
+#	$OpenBSD: ftpusers,v 1.23 2004/05/06 16:58:34 deraadt Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
@@ -33,4 +33,4 @@ _mopd
 _tftpd
 _rbootd
 _afs
-_pppoe
+_ppp
diff --git a/src/etc/group b/src/etc/group
index 58354763..267cae55 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -46,7 +46,7 @@ _mopd:*:78:
 _tftpd:*:79:
 _rbootd:*:80:
 _afs:*:81:
-_pppoe:*:82:
+_ppp:*:82:
 dialer:*:117:
 nogroup:*:32766:
 nobody:*:32767:
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index ca030902..06a34f96 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.13 2004/05/06 16:49:02 deraadt Exp $
+#	$OpenBSD: aliases,v 1.14 2004/05/06 16:58:34 deraadt 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.
@@ -32,7 +32,7 @@ _kdc: /dev/null
 _mopd: /dev/null
 _pflogd: /dev/null
 _portmap: /dev/null
-_pppoe: /dev/null
+_ppp: /dev/null
 _rbootd: /dev/null
 _rstatd: /dev/null
 _rusersd: /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 41bb44d0..e254334e 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -28,5 +28,5 @@ _mopd:*:78:78::0:0:MOP Daemon:/var/empty:/sbin/nologin
 _tftpd:*:79:79::0:0:TFTP Daemon:/var/empty:/sbin/nologin
 _rbootd:*:80:80::0:0:rbootd Daemon:/var/empty:/sbin/nologin
 _afs:*:81:81::0:0:afs Daemon:/var/empty:/sbin/nologin
-_pppoe:*:82:82::0:0:pppoe utilities:/var/empty:/sbin/nologin
+_ppp:*:82:82::0:0:PPP utilities:/var/empty:/sbin/nologin
 nobody:*:32767:32767::0:0:Unprivileged user:/nonexistent:/sbin/nologin