diff --git a/ChangeLog b/ChangeLog
index 95e6c60c..345e5bfa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 
   03 May 2007; Roy Marples <uberlord@gentoo.org>:
 
+    Allow ip6to4 tunnels to use any derived address, #170290.
+
     dns_sortlist and dns_options now work as documented, #175367.
 
   02 May 2007; Roy Marples <uberlord@gentoo.org>:
diff --git a/net.Linux/ip6to4.sh b/net.Linux/ip6to4.sh
index 03d4fac3..f5d8b158 100644
--- a/net.Linux/ip6to4.sh
+++ b/net.Linux/ip6to4.sh
@@ -80,7 +80,7 @@ ip6to4_start() {
 
 	if [ "${IFACE}" != "sit0" ] ; then
 		ebegin "Creating 6to4 tunnel on ${IFACE}"
-		_tunnel add "${IFACE}" mode sit ttl 255 remote any local "${ip}"
+		_tunnel add "${IFACE}" mode sit ttl 255 remote any local any 
 		eend $? || return 1
 		_up
 	fi