diff --git a/ext/lwip.patch b/ext/lwip.patch
index 0a651b3..3b2c5dd 100644
--- a/ext/lwip.patch
+++ b/ext/lwip.patch
@@ -11,6 +11,26 @@ index b7632489..786a294e 100644
  #include "lwip/opt.h"
  
  #if LWIP_SOCKET /* don't build if not configured for use in lwipopts.h */
+diff --git a/src/core/ipv6/nd6.c b/src/core/ipv6/nd6.c
+index 0b367181..2a5b77d4 100644
+--- a/src/core/ipv6/nd6.c
++++ b/src/core/ipv6/nd6.c
+@@ -1361,8 +1361,13 @@ nd6_is_prefix_in_netif(const ip6_addr_t *ip6addr, struct netif *netif)
+   }
+   /* Check to see if address prefix matches a (manually?) configured address. */
+   for (i = 0; i < LWIP_IPV6_NUM_ADDRESSES; i++) {
+-    if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) &&
+-        ip6_addr_netcmp(ip6addr, netif_ip6_addr(netif, i))) {
++    int prefix_match = 0;
++    if (ip6_addr_is_zt_6plane(ip6addr) || ip6_addr_is_zt_adhoc(ip6addr)) {
++      prefix_match = ip6_addr_6plane_cmp(ip6addr, netif_ip6_addr(netif, i));
++    } else {
++      prefix_match = ip6_addr_netcmp(ip6addr, netif_ip6_addr(netif, i));
++    }
++    if (ip6_addr_isvalid(netif_ip6_addr_state(netif, i)) && prefix_match) {
+       return 1;
+     }
+   }
 diff --git a/src/include/lwip/errno.h b/src/include/lwip/errno.h
 index 641cffb0..cec43f7f 100644
 --- a/src/include/lwip/errno.h
@@ -28,3 +48,22 @@ index 641cffb0..cec43f7f 100644
  #endif
  
  #else /* LWIP_PROVIDE_ERRNO */
+diff --git a/src/include/lwip/ip6_addr.h b/src/include/lwip/ip6_addr.h
+index ee381aeb..b879f212 100644
+--- a/src/include/lwip/ip6_addr.h
++++ b/src/include/lwip/ip6_addr.h
+@@ -133,6 +133,14 @@ typedef struct ip6_addr ip6_addr_t;
+ #define ip6_addr_netcmp(addr1, addr2) (((addr1)->addr[0] == (addr2)->addr[0]) && \
+                                        ((addr1)->addr[1] == (addr2)->addr[1]))
+ 
++#define ip6_addr_is_zt_6plane(addr1) (((addr1)->addr[0] & PP_HTONL(0xffffffffUL)) == PP_HTONL(0xfc937e7fUL) && \
++                                        ((addr1)->addr[1] & PP_HTONL(0xff000000UL)) == PP_HTONL(0x72000000UL))
++
++#define ip6_addr_is_zt_adhoc(addr1) (((addr1)->addr[0] & PP_HTONL(0xffff0000UL)) == PP_HTONL(0xfce90000UL))
++
++#define ip6_addr_6plane_cmp(addr1, addr2) (((addr1)->addr[0] == (addr2)->addr[0]) && \
++                                    ((addr1)->addr[1] & PP_HTONL(0xff000000UL)) == ((addr2)->addr[1] & PP_HTONL(0xff000000UL)))
++
+ #define ip6_addr_cmp(addr1, addr2) (((addr1)->addr[0] == (addr2)->addr[0]) && \
+                                     ((addr1)->addr[1] == (addr2)->addr[1]) && \
+                                     ((addr1)->addr[2] == (addr2)->addr[2]) && \
diff --git a/include/lwipopts.h b/include/lwipopts.h
index ba0aee7..600c5d5 100644
--- a/include/lwipopts.h
+++ b/include/lwipopts.h
@@ -86,10 +86,13 @@
  */
 #include "lwip/debug.h"
 
-//#define LWIP_IPV6_MLD 1
-//#define LWIP_IPV6_AUTOCONFIG 1
-//#define LWIP_ICMP6 1
-//#define LWIP_IPV6_NUM_ADDRESSES 6
+#define LWIP_IPV6_AUTOCONFIG 1
+
+// #define LWIP_IPV6_MLD 1
+// #define LWIP_ICMP6 1
+// #define LWIP_IPV6_NUM_ADDRESSES 3
+// #define LWIP_ND6_MAX_MULTICAST_SOLICIT 3
+// #define LWIP_IPV6_SEND_ROUTER_SOLICIT 0
 
 // IP Protocol version
 #define LWIP_NETIF_STATUS_CALLBACK 1
diff --git a/src/lwIP.cpp b/src/lwIP.cpp
index b73ca1a..e38dd3a 100644
--- a/src/lwIP.cpp
+++ b/src/lwIP.cpp
@@ -380,7 +380,7 @@ static err_t netif_init_6(struct netif *netif)
 {
 	netif->hwaddr_len = 6;
 	netif->name[0]    = 'e';
-	netif->name[1]    = '0'+lwipInterfacesCount;
+	netif->name[1]    = '0'+(char)lwipInterfacesCount;
 	netif->linkoutput = lwip_eth_tx;
 	netif->output     = etharp_output;
 	netif->output_ip6 = ethip6_output;
@@ -417,9 +417,12 @@ void lwip_init_interface(void *tapref, const ZeroTier::MAC &mac, const ZeroTier:
 	{
 		static ip6_addr_t ipaddr;
 		memcpy(&(ipaddr.addr), ip.rawIpData(), sizeof(ipaddr.addr));
+		lwipdev->ip6_autoconfig_enabled = 1;
 		netif_add(lwipdev, NULL, NULL, NULL, NULL, netif_init_6, tcpip_input);
-		netif_ip6_addr_set(lwipdev, 1, &ipaddr);
+		netif_ip6_addr_set(lwipdev, 1, &ipaddr);		
 		lwipdev->state = tapref;
+		netif_create_ip6_linklocal_address(lwipdev, 1);
+		netif_ip6_addr_set_state(lwipdev, 0, IP6_ADDR_TENTATIVE);
 		netif_ip6_addr_set_state(lwipdev, 1, IP6_ADDR_TENTATIVE);
 		netif_set_status_callback(lwipdev, netif_status_callback);
 		netif_set_default(lwipdev);