diff -Nru iproute2-3.16.0/debian/changelog iproute2-3.16.0/debian/changelog
--- iproute2-3.16.0/debian/changelog	2015-04-17 19:33:14.000000000 +0100
+++ iproute2-3.16.0/debian/changelog	2015-07-03 14:01:02.000000000 +0100
@@ -1,3 +1,9 @@
+iproute2 (3.16.0-2ubuntu1.1~fan3) vivid; urgency=low
+
+  * Update Ubuntu FAN support.  (LP: #1470091)
+
+ -- Andy Whitcroft <apw@canonical.com>  Mon, 29 Jun 2015 16:59:24 +0100
+
 iproute2 (3.16.0-2ubuntu1) vivid; urgency=low
 
   * Add Ubuntu FAN support.  (LP: #1439706)
diff -Nru iproute2-3.16.0/debian/patches/1000-ubuntu-poc-fan-driver.patch iproute2-3.16.0/debian/patches/1000-ubuntu-poc-fan-driver.patch
--- iproute2-3.16.0/debian/patches/1000-ubuntu-poc-fan-driver.patch	2015-04-16 19:48:34.000000000 +0100
+++ iproute2-3.16.0/debian/patches/1000-ubuntu-poc-fan-driver.patch	2015-06-29 16:20:05.000000000 +0100
@@ -6,14 +6,10 @@
 ===================================================================
 --- iproute2-3.16.0.orig/include/linux/if_tunnel.h
 +++ iproute2-3.16.0/include/linux/if_tunnel.h
-@@ -53,6 +53,13 @@ enum {
+@@ -53,6 +53,9 @@ enum {
  	IFLA_IPTUN_6RD_RELAY_PREFIX,
  	IFLA_IPTUN_6RD_PREFIXLEN,
  	IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
-+	IFLA_IPTUN_ENCAP_TYPE,
-+	IFLA_IPTUN_ENCAP_FLAGS,
-+	IFLA_IPTUN_ENCAP_SPORT,
-+	IFLA_IPTUN_ENCAP_DPORT,
 +
 +	IFLA_IPTUN_FAN_UNDERLAY = 32,
 +
diff -Nru iproute2-3.16.0/debian/patches/1001-ubuntu-poc-fan-driver-v3.patch iproute2-3.16.0/debian/patches/1001-ubuntu-poc-fan-driver-v3.patch
--- iproute2-3.16.0/debian/patches/1001-ubuntu-poc-fan-driver-v3.patch	1970-01-01 01:00:00.000000000 +0100
+++ iproute2-3.16.0/debian/patches/1001-ubuntu-poc-fan-driver-v3.patch	2015-06-29 16:25:26.000000000 +0100
@@ -0,0 +1,128 @@
+Index: iproute2-3.16.0/include/linux/if_tunnel.h
+===================================================================
+--- iproute2-3.16.0.orig/include/linux/if_tunnel.h
++++ iproute2-3.16.0/include/linux/if_tunnel.h
+@@ -55,6 +55,7 @@ enum {
+ 	IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
+ 
+ 	IFLA_IPTUN_FAN_UNDERLAY = 32,
++	IFLA_IPTUN_FAN_MAP = 33,
+ 
+ 	__IFLA_IPTUN_MAX,
+ };
+@@ -116,4 +117,20 @@ enum {
+ };
+ 
+ #define IFLA_VTI_MAX	(__IFLA_VTI_MAX - 1)
++
++enum {
++	IFLA_FAN_UNSPEC,
++	IFLA_FAN_MAPPING,
++	__IFLA_FAN_MAX,
++};
++
++#define IFLA_FAN_MAX (__IFLA_FAN_MAX - 1)
++
++struct ip_tunnel_fan_map {
++	__be32		underlay;
++	__be32		overlay;
++	__u16		underlay_prefix;
++	__u16		overlay_prefix;
++};
++
+ #endif /* _IF_TUNNEL_H_ */
+Index: iproute2-3.16.0/ip/link_iptnl.c
+===================================================================
+--- iproute2-3.16.0.orig/ip/link_iptnl.c
++++ iproute2-3.16.0/ip/link_iptnl.c
+@@ -41,6 +41,42 @@ static void usage(int sit)
+ 	fprintf(stderr, "       TTL  := { 1..255 | inherit }\n");
+ 	exit(-1);
+ }
++static int fan_parse_map(int *argcp, char ***argvp, struct nlmsghdr *n)
++{
++	inet_prefix underlay, overlay;
++	struct ip_tunnel_fan_map map;
++	struct rtattr *nest;
++	char **argv = *argvp;
++	int argc = *argcp;
++
++	nest = addattr_nest(n, 1024, IFLA_IPTUN_FAN_MAP);
++	while (argc > 0) {
++		char *colon = strchr(*argv, ':');
++
++		if (!colon)
++			break;
++		*colon = '\0';
++
++		if (get_prefix(&overlay, *argv, AF_INET))
++			invarg("invalid fan-map overlay", *argv);
++		if (get_prefix(&underlay, colon + 1, AF_INET))
++			invarg("invalid fan-map underlay", colon + 1);
++		
++		memcpy(&map.underlay, underlay.data, 4);
++		map.underlay_prefix = underlay.bitlen;
++		memcpy(&map.overlay, overlay.data, 4);
++		map.overlay_prefix = overlay.bitlen;
++
++		argc--, argv++;
++
++		addattr_l(n, 1024, IFLA_FAN_MAPPING, &map, sizeof(map));
++	}
++	addattr_nest_end(n, nest);
++
++	*argcp = argc;
++	*argvp = argv;
++	return 0;
++}
+ 
+ static int iptunnel_parse_opt(struct link_util *lu, int argc, char **argv,
+ 			      struct nlmsghdr *n)
+@@ -158,6 +194,10 @@ get_failed:
+ 		} else if (strcmp(*argv, "underlay") == 0) {
+ 			NEXT_ARG();
+ 			underlay = get_addr32(*argv);
++		} else if (strcmp(*argv, "fan-map") == 0) {
++			NEXT_ARG();
++			if (fan_parse_map(&argc, &argv, n))
++				invarg("invalid fan-map", *argv);
+ 		} else if (strcmp(*argv, "local") == 0) {
+ 			NEXT_ARG();
+ 			if (strcmp(*argv, "any"))
+@@ -268,6 +308,26 @@ get_failed:
+ 	return 0;
+ }
+ 
++static void fan_print_map(FILE *f, struct rtattr *attr)
++{
++	char b1[INET_ADDRSTRLEN], b2[INET_ADDRSTRLEN];
++	struct ip_tunnel_fan_map *m;
++	struct rtattr *i;
++	int rem;
++
++	fprintf(f, "fan-map ");
++
++	rem = RTA_PAYLOAD(attr);
++	for (i = RTA_DATA(attr); RTA_OK(i, rem); i = RTA_NEXT(i, rem)) {
++		m = RTA_DATA(i);
++		fprintf(f, "%s/%d:%s/%d ",
++			rt_addr_n2a(AF_INET, &m->overlay, b1, INET_ADDRSTRLEN),
++			m->overlay_prefix,
++			rt_addr_n2a(AF_INET, &m->underlay, b2, INET_ADDRSTRLEN),
++			m->underlay_prefix);
++	}
++}
++
+ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
+ {
+ 	char s1[1024];
+@@ -304,6 +364,9 @@ static void iptunnel_print_opt(struct li
+ 				format_host(AF_INET, 4, &addr, s1, sizeof(s1)));
+ 	}
+ 
++	if (tb[IFLA_IPTUN_FAN_MAP])
++		fan_print_map(f, tb[IFLA_IPTUN_FAN_MAP]);
++
+ 	if (tb[IFLA_IPTUN_LINK] && rta_getattr_u32(tb[IFLA_IPTUN_LINK])) {
+ 		unsigned link = rta_getattr_u32(tb[IFLA_IPTUN_LINK]);
+ 		const char *n = if_indextoname(link, s2);
diff -Nru iproute2-3.16.0/debian/patches/series iproute2-3.16.0/debian/patches/series
--- iproute2-3.16.0/debian/patches/series	2015-02-24 14:46:35.000000000 +0000
+++ iproute2-3.16.0/debian/patches/series	2015-06-29 16:20:55.000000000 +0100
@@ -2,3 +2,4 @@
 0002-txtdocs.patch
 0003-ip-link-Remove-unnecessary-device-checking.patch
 1000-ubuntu-poc-fan-driver.patch
+1001-ubuntu-poc-fan-driver-v3.patch