diff --git a/src/etc/Makefile b/src/etc/Makefile
index 9a89f767..0a394ba1 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.338 2013/11/26 20:11:51 sthen Exp $
+#	$OpenBSD: Makefile,v 1.339 2013/12/15 17:40:45 tedu Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -55,7 +55,7 @@ RCDAEMONS=	amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
 		relayd ripd route6d rtadvd rtsold rwhod sasyncd sendmail \
 		sensorsd slowcgi smtpd snmpd spamd sshd syslogd watchdogd \
 		wsmoused xdm ypbind ypldap yppasswdd ypserv kdc kadmind \
-		kpasswdd nfsd mountd lockd statd spamlogd sndiod popa3d \
+		kpasswdd nfsd mountd lockd statd spamlogd sndiod \
 		tftpd tftpproxy ldomd ipropd_master ipropd_slave
 
 MISETS=	base${OSrev}.tgz comp${OSrev}.tgz \
diff --git a/src/etc/ftpusers b/src/etc/ftpusers
index a15d2c57..c0241d0b 100644
--- a/src/etc/ftpusers
+++ b/src/etc/ftpusers
@@ -1,4 +1,4 @@
-#	$OpenBSD: ftpusers,v 1.46 2013/08/19 16:31:18 ajacoutot Exp $
+#	$OpenBSD: ftpusers,v 1.47 2013/12/15 17:40:45 tedu Exp $
 #
 # list of users disallowed any ftp access.
 # read by ftpd(8).
@@ -7,7 +7,6 @@ daemon
 operator
 bin
 smmsp
-popa3d
 sshd
 uucp
 www
diff --git a/src/etc/group b/src/etc/group
index 218c3621..1343b80d 100644
--- a/src/etc/group
+++ b/src/etc/group
@@ -12,7 +12,6 @@ auth:*:11:
 games:*:13:
 staff:*:20:root
 smmsp:*:25:
-popa3d:*:26:
 sshd:*:27:
 _portmap:*:28:
 _identd:*:29:
diff --git a/src/etc/inetd.conf b/src/etc/inetd.conf
index b41d802f..199e74a6 100644
--- a/src/etc/inetd.conf
+++ b/src/etc/inetd.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: inetd.conf,v 1.63 2013/08/07 22:07:34 dlg Exp $
+#	$OpenBSD: inetd.conf,v 1.64 2013/12/15 17:40:45 tedu Exp $
 #
 # Internet server configuration database
 #
@@ -15,8 +15,6 @@
 127.0.0.1:comsat dgram	udp	wait	root	/usr/libexec/comsat	comsat
 [::1]:comsat	dgram	udp6	wait	root	/usr/libexec/comsat	comsat
 #ntalk		dgram	udp	wait	root	/usr/libexec/ntalkd	ntalkd
-#pop3		stream	tcp	nowait	root	/usr/sbin/popa3d	popa3d
-#pop3		stream	tcp6	nowait	root	/usr/sbin/popa3d	popa3d
 # Internal services
 #echo		stream	tcp	nowait	root	internal
 #echo		stream	tcp6	nowait	root	internal
diff --git a/src/etc/mail/aliases b/src/etc/mail/aliases
index acf1078b..873efebb 100644
--- a/src/etc/mail/aliases
+++ b/src/etc/mail/aliases
@@ -1,5 +1,5 @@
 #
-#	$OpenBSD: aliases,v 1.39 2013/08/19 16:31:18 ajacoutot Exp $
+#	$OpenBSD: aliases,v 1.40 2013/12/15 17:40:45 tedu 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.
@@ -60,7 +60,6 @@ _ypldap: /dev/null
 bin:	/dev/null
 named:	/dev/null
 nobody:	/dev/null
-popa3d: /dev/null
 proxy:  /dev/null
 smmsp:  /dev/null
 sshd:   /dev/null
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
index 488e58c6..48cfc7f7 100644
--- a/src/etc/master.passwd
+++ b/src/etc/master.passwd
@@ -3,7 +3,6 @@ daemon:*:1:1::0:0:The devil himself:/root:/sbin/nologin
 operator:*:2:5::0:0:System &:/operator:/sbin/nologin
 bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin
 smmsp:*:25:25::0:0:Sendmail Message Submission Program:/nonexistent:/sbin/nologin
-popa3d:*:26:26::0:0:POP3 Server:/var/empty:/sbin/nologin
 sshd:*:27:27::0:0:sshd privsep:/var/empty:/sbin/nologin
 _portmap:*:28:28::0:0:portmap:/var/empty:/sbin/nologin
 _identd:*:29:29::0:0:identd:/var/empty:/sbin/nologin
diff --git a/src/etc/rc b/src/etc/rc
index a32dd68f..e678ad0b 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.407 2013/08/09 16:24:54 ajacoutot Exp $
+#	$OpenBSD: rc,v 1.408 2013/12/15 17:40:45 tedu Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -495,7 +495,7 @@ fi
 
 start_daemon hostapd rwhod lpd sendmail smtpd httpd slowcgi nginx ftpd
 start_daemon ftpproxy tftpd tftpproxy identd inetd rarpd bootparamd
-start_daemon rbootd mopd popa3d spamd spamlogd kdc kadmind kpasswdd
+start_daemon rbootd mopd spamd spamlogd kdc kadmind kpasswdd
 start_daemon ipropd_master ipropd_slave sndiod
 echo '.'
 
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 16baad93..a7c92e7d 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.182 2013/08/10 07:33:19 ajacoutot Exp $
+#	$OpenBSD: rc.conf,v 1.183 2013/12/15 17:40:45 tedu Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -88,9 +88,6 @@ spamlogd_flags=""	# use eg. "-i interface" and see spamlogd(8)
 # Set to NO if ftpd is running out of inetd
 ftpd_flags=NO		# for non-inetd use: ""
 
-# Set to NO if popa3d is running out of inetd
-popa3d_flags=NO		# for non-inetd use: ""
-
 # On some architectures, you must also disable console getty in /etc/ttys
 xdm_flags=NO		# for normal use: ""
 
diff --git a/src/etc/rc.d/popa3d b/src/etc/rc.d/popa3d
deleted file mode 100644
index e86ceee9..00000000
--- a/src/etc/rc.d/popa3d
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: popa3d,v 1.3 2011/12/21 09:26:29 ajacoutot Exp $
-
-daemon="/usr/sbin/popa3d -D"
-
-. /etc/rc.d/rc.subr
-
-rc_reload=NO
-
-rc_cmd $1