diff --git a/src/etc/mtree/4.4BSD.dist b/src/etc/mtree/4.4BSD.dist
index dc658c88..895a11fc 100644
--- a/src/etc/mtree/4.4BSD.dist
+++ b/src/etc/mtree/4.4BSD.dist
@@ -1,4 +1,4 @@
-#	$OpenBSD: 4.4BSD.dist,v 1.197 2009/05/12 07:22:58 ajacoutot Exp $
+#	$OpenBSD: 4.4BSD.dist,v 1.198 2009/06/30 15:23:51 robert Exp $
 
 /set type=dir uname=root gname=wheel mode=0755
 # .
@@ -2784,6 +2784,12 @@ vi.recover	 mode=01777
 # ./www
 www type=dir uname=root gname=daemon mode=755
 
+# ./www/dev
+dev type=dir uname=root gname=daemon mode=755
+
+# ./www
+..
+
 # ./www/icons
 icons  type=dir uname=root gname=daemon mode=755
 
diff --git a/src/etc/rc b/src/etc/rc
index e6412e78..1c9473f0 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.326 2009/06/03 14:45:39 jj Exp $
+#	$OpenBSD: rc,v 1.327 2009/06/30 15:23:51 robert Exp $
 
 # System startup script run by init on autoboot
 # or after single-user.
@@ -331,6 +331,10 @@ dmesg >/var/run/dmesg.boot
 
 echo 'starting system logger'
 rm -f /dev/log
+if [ X"${httpd_flags}" != X"-u" ]; then
+	rm -f /var/www/dev/log
+	syslogd_flags="${syslogd_flags} -a /var/www/dev/log"
+fi
 if [ X"${named_flags}" != X"NO" ]; then
 	rm -f /var/named/dev/log
 	syslogd_flags="${syslogd_flags} -a /var/named/dev/log"