diff --git a/src/etc/rc b/src/etc/rc
index 9a37d730..61a580a8 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.392 2011/07/28 19:09:16 halex Exp $
+#	$OpenBSD: rc,v 1.393 2011/09/16 10:11:20 robert Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -504,7 +504,7 @@ fi
 
 start_daemon hostapd rwhod lpd ldapd sendmail smtpd httpd ftpd
 start_daemon ftpproxy identd inetd rarpd bootparamd rbootd mopd
-start_daemon spamd spamlogd kdc kadmind kpasswdd aucat
+start_daemon popa3d spamd spamlogd kdc kadmind kpasswdd aucat
 echo '.'
 
 if [ X"${spamd_flags}" != X"NO" ]; then
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index afcde804..4248dea7 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.160 2011/07/24 15:33:41 fgsch Exp $
+#	$OpenBSD: rc.conf,v 1.161 2011/09/16 10:11:20 robert Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ldpd_flags=NO		# for normal use: ""
@@ -70,6 +70,9 @@ ftpd_flags=NO		# for non-inetd use: "-D"
 # Set to NO if identd is running out of inetd
 identd_flags=NO		# for non-inetd use: "-b -elo"
 
+# Set to NO if popa3d is running out of inetd
+popa3d_flags=NO		# for non-inetd use: "-D"
+
 # 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
new file mode 100644
index 00000000..dfe37a17
--- /dev/null
+++ b/src/etc/rc.d/popa3d
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $OpenBSD: popa3d,v 1.1 2011/09/16 10:11:20 robert Exp $
+
+daemon="/usr/sbin/popa3d"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1