diff --git a/src/etc/rc b/src/etc/rc
index 157cb61e..52587be9 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.401 2012/08/20 12:37:52 dlg Exp $
+#	$OpenBSD: rc,v 1.402 2012/08/26 19:25:19 ajacoutot Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -493,10 +493,9 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then
 	fi
 fi
 
-start_daemon hostapd rwhod lpd sendmail smtpd
-start_daemon httpd ftpd ftpproxy tftpd tftpproxy
-start_daemon identd inetd rarpd bootparamd rbootd mopd popa3d
-start_daemon spamd spamlogd kdc kadmind kpasswdd sndiod
+start_daemon hostapd rwhod lpd sendmail smtpd httpd nginx ftpd ftpproxy
+start_daemon tftpd tftpproxy identd inetd rarpd bootparamd rbootd mopd
+start_daemon popa3d spamd spamlogd kdc kadmind kpasswdd sndiod
 echo '.'
 
 if [ X"${spamd_flags}" != X"NO" ]; then
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index f4009bba..7c080e0b 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.169 2012/08/23 06:18:50 deraadt Exp $
+#	$OpenBSD: rc.conf,v 1.170 2012/08/26 19:25:19 ajacoutot Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ldpd_flags=NO		# for normal use: ""
@@ -61,6 +61,9 @@ tftpproxy_flags=NO	# for normal use: ""
 # use -u to disable chroot, see httpd(8)
 httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))
 
+# use -u to disable chroot, see nginx(8)
+nginx_flags=NO		# for normal use: ""
+
 # For normal use: "-L sm-mta -bd -q30m", and note there is a cron job
 sendmail_flags="-L sm-mta -C/etc/mail/localhost.cf -bd -q30m"
 spamd_flags=NO		# for normal use: "" and see spamd(8)