diff --git a/src/etc/Makefile b/src/etc/Makefile
index fa694671..3c5280e8 100644
--- a/src/etc/Makefile
+++ b/src/etc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.407 2015/08/24 10:41:11 ajacoutot Exp $
+#	$OpenBSD: Makefile,v 1.408 2015/09/12 14:48:06 sthen Exp $
 
 TZDIR=		/usr/share/zoneinfo
 LOCALTIME=	Canada/Mountain
@@ -52,12 +52,13 @@ EXAMPLES_600=bgpd.conf dvmrpd.conf hostapd.conf iked.conf ipsec.conf \
 	sasyncd.conf snmpd.conf ypldap.conf 
 
 # -r-xr-xr-x
-RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd ftpd ftpproxy \
-	hostapd hotplugd httpd identd ifstated iked inetd isakmpd iscsid \
-	ldapd ldattach ldomd ldpd lockd lpd mopd mountd mrouted nfsd \
-	npppd nsd ntpd ospf6d ospfd pflogd portmap radiusd rarpd rbootd relayd \
-	ripd route6d rtadvd sasyncd sensorsd slowcgi smtpd sndiod \
-	snmpd spamd spamlogd sshd statd syslogd tftpd tftpproxy unbound \
+RCDAEMONS=amd apmd bgpd bootparamd cron dhcpd dhcrelay dvmrpd ftpd \
+	ftpproxy ftpproxy6 hostapd hotplugd httpd identd ifstated \
+	iked inetd isakmpd iscsid ldapd ldattach ldomd ldpd lockd \
+	lpd mopd mountd mrouted nfsd npppd nsd ntpd ospf6d ospfd \
+	pflogd portmap radiusd rarpd rbootd relayd ripd route6d \
+	rtadvd sasyncd sensorsd slowcgi smtpd sndiod snmpd spamd \
+	spamlogd sshd statd syslogd tftpd tftpproxy unbound \
 	watchdogd wsmoused xdm ypbind ypldap yppasswdd ypserv
 
 MISETS=	base${OSrev}.tgz comp${OSrev}.tgz man${OSrev}.tgz game${OSrev}.tgz
diff --git a/src/etc/rc b/src/etc/rc
index 0735432f..4db81ee3 100644
--- a/src/etc/rc
+++ b/src/etc/rc
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc,v 1.460 2015/08/28 18:10:46 rpe Exp $
+#	$OpenBSD: rc,v 1.461 2015/09/12 14:48:06 sthen Exp $
 
 # System startup script run by init on autoboot or after single-user.
 # Output and error are redirected to console by init, and the console is the
@@ -488,7 +488,7 @@ if ifconfig lo0 inet6 >/dev/null 2>&1; then
 fi
 
 start_daemon hostapd lpd smtpd slowcgi httpd ftpd
-start_daemon ftpproxy tftpd tftpproxy identd inetd rarpd bootparamd
+start_daemon ftpproxy ftpproxy6 tftpd tftpproxy identd inetd rarpd bootparamd
 start_daemon rbootd mopd spamd spamlogd sndiod
 echo '.'
 
diff --git a/src/etc/rc.conf b/src/etc/rc.conf
index ac2f3ffe..24d054c5 100644
--- a/src/etc/rc.conf
+++ b/src/etc/rc.conf
@@ -1,4 +1,4 @@
-#	$OpenBSD: rc.conf,v 1.204 2015/08/03 04:19:25 yasuoka Exp $
+#	$OpenBSD: rc.conf,v 1.205 2015/09/12 14:48:06 sthen Exp $
 
 # DO NOT EDIT THIS FILE!!
 #
@@ -22,6 +22,7 @@ dhcrelay_flags=NO	# for normal use: "-i interface [server]"
 dvmrpd_flags=NO
 ftpd_flags=NO		# set to NO if ftpd is running out of inetd
 ftpproxy_flags=NO
+ftpproxy6_flags=NO
 hostapd_flags=NO
 hotplugd_flags=NO
 httpd_flags=NO
diff --git a/src/etc/rc.d/ftpproxy6 b/src/etc/rc.d/ftpproxy6
new file mode 100755
index 00000000..b0b1b7ed
--- /dev/null
+++ b/src/etc/rc.d/ftpproxy6
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $OpenBSD: ftpproxy6,v 1.1 2015/09/12 14:48:06 sthen Exp $
+
+daemon="/usr/sbin/ftp-proxy -6"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+
+rc_cmd $1