Index: etc/rc.d/auto_linklocal
diff -u etc/rc.d/auto_linklocal.orig etc/rc.d/auto_linklocal
--- etc/rc.d/auto_linklocal.orig	Sun Oct  8 01:22:19 2006
+++ etc/rc.d/auto_linklocal	Sun Oct  8 01:23:44 2006
@@ -10,9 +10,15 @@
 . /etc/rc.subr
 
 name="auto_linklocal"
-rcvar=`set_rcvar ipv6`
-start_cmd="${SYSCTL_W} net.inet6.ip6.auto_linklocal=1"
+start_cmd="auto_linklocal_start"
 stop_cmd=":"
+
+auto_linklocal_start()
+{
+	if ! checkyesno ipv6_enable; then
+		${SYSCTL_W} net.inet6.ip6.auto_linklocal=0
+	fi
+}
 
 load_rc_config $name
 run_rc_command "$1"
Index: sys/netinet6/in6_ifattach.c
diff -u -p sys/netinet6/in6_ifattach.c.orig sys/netinet6/in6_ifattach.c
--- sys/netinet6/in6_ifattach.c.orig	Sat Oct  7 00:11:16 2006
+++ sys/netinet6/in6_ifattach.c	Sun Oct  8 01:20:41 2006
@@ -65,7 +65,7 @@ unsigned long in6_maxmtu = 0;
 #ifdef IP6_AUTO_LINKLOCAL
 int ip6_auto_linklocal = IP6_AUTO_LINKLOCAL;
 #else
-int ip6_auto_linklocal = 0;	/* disable by default */
+int ip6_auto_linklocal = 1;	/* enable by default */
 #endif
 
 struct callout in6_tmpaddrtimer_ch;