diff --git a/src/etc/Makefile b/src/etc/Makefile
index 872e89f9..fc6c0667 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.385 2014/07/22 17:05:45 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.386 2014/07/22 17:37:15 reyk Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -45,14 +45,14 @@ EXAMPLES+= wsconsctl.conf
 .endif
 
 # -rw-------
-EXAMPLES_600=bgpd.conf dvmrpd.conf hostapd.conf iked.conf ipsec.conf \
-	ldapd.conf ldpd.conf ospf6d.conf ospfd.conf pf.conf rc.local \
-	rc.securelevel rc.shutdown relayd.conf ripd.conf \
+EXAMPLES_600=bgpd.conf dvmrpd.conf hostapd.conf httpd.conf iked.conf \
+	ipsec.conf ldapd.conf ldpd.conf ospf6d.conf ospfd.conf pf.conf \
+	rc.local rc.securelevel rc.shutdown relayd.conf ripd.conf \
 	sasyncd.conf snmpd.conf ypldap.conf 
 
 # -r-xr-xr-x
 RCDAEMONS=	amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd \
-		ftpd ftpproxy hostapd hotplugd identd ifstated iked \
+		ftpd ftpproxy hostapd hotplugd httpd identd ifstated iked \
 		inetd isakmpd ldapd npppd ldattach ldpd lpd mopd mrouted \
 		named nginx nsd ntpd ospfd ospf6d portmap pflogd rarpd rbootd \
 		relayd ripd route6d rtadvd rtsold sasyncd sendmail \
diff --git a/src/etc/changelist b/src/etc/changelist
index ab60bd11..0c138515 100644
--- a/src/etc/changelist
+++ b/src/etc/changelist
@@ -1,4 +1,4 @@
-#	$OpenBSD: changelist,v 1.96 2014/07/16 10:25:38 deraadt Exp $
+#	$OpenBSD: changelist,v 1.97 2014/07/22 17:37:16 reyk Exp $
 #
 # List of files which the security script backs up and checks
 # for modifications.
@@ -40,6 +40,7 @@
 +/etc/hostname.*
 /etc/hosts
 /etc/hosts.lpd
++/etc/httpd.conf
 +/etc/ifstated.conf
 +/etc/iked.conf
 +/etc/inetd.conf
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index 08c07358..8f844b66 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.194 2014/07/21 20:39:59 naddy Exp $
+#	$OpenBSD: rc.conf,v 1.195 2014/07/22 17:37:16 reyk Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -48,6 +48,7 @@ hotplugd_flags=NO	# for normal use: ""
 watchdogd_flags=NO	# for normal use: ""
 ftpproxy_flags=NO	# for normal use: ""
 hostapd_flags=NO	# for normal use: ""
+httpd_flags=NO		# for normal use: ""
 ifstated_flags=NO	# for normal use: ""
 relayd_flags=NO		# for normal use: ""
 snmpd_flags=NO		# for normal use: ""
diff --git a/src/etc/rc.d/httpd b/src/etc/rc.d/httpd
new file mode 100644
index 00000000..406f46ea
--- /dev/null
+++ b/src/etc/rc.d/httpd
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $OpenBSD: httpd,v 1.3 2014/07/22 17:37:16 reyk Exp $
+
+daemon="/usr/sbin/httpd"
+
+. /etc/rc.d/rc.subr
+
+pexp="httpd: parent.*"
+
+rc_cmd $1