diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index 611d4a8f4556..4b48f5fb7b06 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -154,6 +154,8 @@ pflog_enable="NO"		# Set to YES to enable packet filter logging
 pflog_logfile="/var/log/pflog"	# where pflogd should store the logfile
 pflog_program="/sbin/pflogd"	# where the pflogd program lives
 pflog_flags=""			# additional flags for pflogd
+ftpproxy_enable="NO"		# Set to YES to enable ftp-proxy(8) for pf
+ftpproxy_flags=""		# additional flags for ftp-proxy(8)
 pfsync_enable="NO"		# Expose pf state to other hosts for syncing
 pfsync_syncdev=""		# Interface for pfsync to work through
 pfsync_syncpeer=""		# IP address of pfsync peer host
diff --git a/etc/rc.d/ftp-proxy b/etc/rc.d/ftp-proxy
new file mode 100644
index 000000000000..0b2604d96683
--- /dev/null
+++ b/etc/rc.d/ftp-proxy
@@ -0,0 +1,17 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: ftp-proxy
+# REQUIRE: DAEMON pf
+#
+
+. /etc/rc.subr
+
+name="ftpproxy"
+rcvar=`set_rcvar`
+command="/usr/sbin/ftp-proxy"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index b6ade14ba45c..02c643213dc2 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 11, 2007
+.Dd September 3, 2007
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -831,6 +831,24 @@ Empty by default.
 This variable contains additional flags passed to the
 .Xr pflogd 8
 program.
+.It Va ftpproxy_enable
+.Pq Vt bool
+Set to
+.Dq Li NO
+by default.
+Setting this to
+.Dq Li YES
+enables
+.Xr ftp-proxy 8
+which supports the
+.Xr pf 4
+packet filter in translating ftp connections.
+.It Va ftpproxy_flags
+.Pq Vt str
+Empty by default.
+This variable contains additional flags passed to the
+.Xr ftp-proxy 8
+program.
 .It Va pfsync_enable
 .Pq Vt bool
 Set to