diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index cbc2b875..66675811 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: rc.conf,v 1.165 2011/12/21 09:53:15 ajacoutot Exp $
+#	$OpenBSD: rc.conf,v 1.166 2012/03/05 10:43:42 dlg Exp $
 
 # set these to "NO" to turn them off.  otherwise, they're used as flags
 ldpd_flags=NO		# for normal use: ""
@@ -55,6 +55,7 @@ kadmind_flags=NO	# for normal use: ""
 kpasswdd_flags=NO	# for normal use: ""
 btd_flags=NO		# for normal use: ""
 amd_flags=NO		# for normal use: ""
+tftpd_flags=NO		# for normal use: "[chroot dir]"
 
 # use -u to disable chroot, see httpd(8)
 httpd_flags=NO		# for normal use: "" (or "-DSSL" after reading ssl(8))
diff --git a/src/etc/rc.d/tftpd b/src/etc/rc.d/tftpd
new file mode 100644
index 00000000..c084c0ca
--- /dev/null
+++ b/src/etc/rc.d/tftpd
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $OpenBSD: tftpd,v 1.1 2012/03/05 10:43:42 dlg Exp $
+
+daemon="/usr/sbin/tftpd"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1