Index: etc/defaults/rc.conf
===================================================================
RCS file: /home/ncvs/src/etc/defaults/rc.conf,v
retrieving revision 1.324
diff -u -r1.324 rc.conf
--- etc/defaults/rc.conf	25 Jan 2008 05:23:01 -0000	1.324
+++ etc/defaults/rc.conf	27 Jan 2008 14:46:39 -0000
@@ -122,6 +122,7 @@
 firewall_nat_enable="NO"	# Enable kernel NAT (if firewall_enable == YES)
 firewall_nat_interface=""	# Public interface or IPaddress to use
 firewall_nat_flags=""		# Additional configuration parameters
+dummynet_enable="NO"		# Load the dummynet(4) module
 ip_portrange_first="NO"		# Set first dynamically allocated port
 ip_portrange_last="NO"		# Set last dynamically allocated port
 ike_enable="NO"			# Enable IKE daemon (usually racoon or isakmpd)
Index: etc/rc.d/ipfw
===================================================================
RCS file: /home/ncvs/src/etc/rc.d/ipfw,v
retrieving revision 1.16
diff -u -r1.16 ipfw
--- etc/rc.d/ipfw	26 Jan 2008 14:02:19 -0000	1.16
+++ etc/rc.d/ipfw	27 Jan 2008 14:41:57 -0000
@@ -14,9 +14,17 @@
 name="ipfw"
 rcvar="firewall_enable"
 start_cmd="ipfw_start"
+start_precmd="ipfw_prestart"
 stop_cmd="ipfw_stop"
 required_modules="ipfw"
 
+ipfw_prestart()
+{
+	if checkyesno dummynet_enable; then
+		required_modules="$required_modules dummynet"
+	fi
+}
+
 ipfw_start()
 {
 	# set the firewall rules script if none was specified
Index: share/man/man5/rc.conf.5
===================================================================
RCS file: /home/ncvs/src/share/man/man5/rc.conf.5,v
retrieving revision 1.333
diff -u -r1.333 rc.conf.5
--- share/man/man5/rc.conf.5	23 Jan 2008 16:08:35 -0000	1.333
+++ share/man/man5/rc.conf.5	27 Jan 2008 15:11:45 -0000
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD: src/share/man/man5/rc.conf.5,v 1.333 2008/01/23 16:08:35 chinsan Exp $
 .\"
-.Dd January 23, 2008
+.Dd January 27, 2008
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -509,6 +509,16 @@
 .It Va firewall_nat_flags
 .Pq Vt str
 Additional configuration parameters for kernel NAT should be placed here.
+.It Va dummynet_enable
+.Pq Vt bool
+Setting this to
+.Dq Li YES
+will automatically load the
+.Xr dummynet 4
+module if
+.Va firewall_enable
+is also set to
+.Dq Li YES .
 .\" -------------------------------------------------------------------
 .It Va natd_program
 .Pq Vt str
@@ -3846,6 +3856,7 @@
 .Xr vi 1 ,
 .Xr vidcontrol 1 ,
 .Xr bridge 4 ,
+.Xr dummynet 4 ,
 .Xr ip 4 ,
 .Xr ipf 4 ,
 .Xr ipfw 4 ,