--- network.subr	(revision 343111)
+++ network.subr	(working copy)
@@ -122,7 +122,7 @@ ifn_vnet0()
 #
 ifconfig_up()
 {
-	local _cfg _ifconfig_descr _ipv6_opts ifconfig_args 
+	local _al _cfg _ifconfig_descr _ipv6_opts ifconfig_args
 	_cfg=1
 
 	# Make sure lo0 always comes up.
@@ -187,7 +187,15 @@ ifconfig_up()
 				ifconfig_args="inet6 ${ifconfig_args}"
 			;;
 			esac
-			${IFCONFIG_CMD} $1 inet6 -ifdisabled
+
+			_al=''
+			case "${ifconfig_args}" in
+			*-auto_linklocal*)
+				_al="-auto_linklocal"
+			;;
+			esac
+
+			${IFCONFIG_CMD} $1 inet6 ${_al} -ifdisabled
 			eval ${IFCONFIG_CMD} $1 ${ifconfig_args}
 			_cfg=0
 		fi