diff -Nru network-manager-openvpn-1.2.4/debian/changelog network-manager-openvpn-1.2.4/debian/changelog
--- network-manager-openvpn-1.2.4/debian/changelog	2016-07-07 21:46:32.000000000 +0800
+++ network-manager-openvpn-1.2.4/debian/changelog	2016-09-30 07:12:46.000000000 +0800
@@ -1,3 +1,10 @@
+network-manager-openvpn (1.2.4-1ubuntu1) yakkety; urgency=medium
+
+  * Merge with Debian, remaining changes:
+    - Allow the "udp6" and "tcp6" protocols to be passed through to OpenVPN.
+
+ -- Aron Xu <happyaron@ubuntu.com>  Fri, 30 Sep 2016 07:12:06 +0800
+
 network-manager-openvpn (1.2.4-1) unstable; urgency=medium
 
   * Imported Upstream version 1.2.4
diff -Nru network-manager-openvpn-1.2.4/debian/patches/series network-manager-openvpn-1.2.4/debian/patches/series
--- network-manager-openvpn-1.2.4/debian/patches/series	2016-07-07 21:46:32.000000000 +0800
+++ network-manager-openvpn-1.2.4/debian/patches/series	2016-09-30 07:09:58.000000000 +0800
@@ -1 +1,2 @@
 Use-user-nobody-group-nogroup-when-exporting-an-OpenVPN-c.patch
+Support-IPv6-Servers.patch
diff -Nru network-manager-openvpn-1.2.4/debian/patches/Support-IPv6-Servers.patch network-manager-openvpn-1.2.4/debian/patches/Support-IPv6-Servers.patch
--- network-manager-openvpn-1.2.4/debian/patches/Support-IPv6-Servers.patch	1970-01-01 08:00:00.000000000 +0800
+++ network-manager-openvpn-1.2.4/debian/patches/Support-IPv6-Servers.patch	2016-09-30 07:11:54.000000000 +0800
@@ -0,0 +1,31 @@
+This allows the user to set the udp6 and tcp6 protocols and have
+NetworkManager pass them through to OpenVPN.
+
+Index: network-manager-openvpn-1.2.4/properties/nm-openvpn-editor.c
+===================================================================
+--- network-manager-openvpn-1.2.4.orig/properties/nm-openvpn-editor.c
++++ network-manager-openvpn-1.2.4/properties/nm-openvpn-editor.c
+@@ -100,7 +100,7 @@ check_gateway_entry (const char *str)
+ 				goto out;
+ 		}
+ 		/* check proto */
+-		if (proto && strcmp (proto, "udp") && strcmp (proto, "tcp"))
++		if (proto && strcmp (proto, "udp") && strcmp (proto, "tcp") && strcmp (proto, "udp6") && strcmp (proto, "tcp6"))
+ 			goto out;
+ 	}
+ 	success = TRUE;
+Index: network-manager-openvpn-1.2.4/src/nm-openvpn-service.c
+===================================================================
+--- network-manager-openvpn-1.2.4.orig/src/nm-openvpn-service.c
++++ network-manager-openvpn-1.2.4/src/nm-openvpn-service.c
+@@ -1192,6 +1192,10 @@ nm_openvpn_start_openvpn_binary (NMOpenv
+ 							add_openvpn_arg (args, proto);
+ 					else if (!strcmp (proto, "tcp"))
+ 							add_openvpn_arg (args, "tcp-client");
++					else if (!strcmp (proto, "udp6"))
++							add_openvpn_arg (args, proto);
++					else if (!strcmp (proto, "tcp6"))
++							add_openvpn_arg (args, proto);
+ 					else {
+ 						g_set_error (error,
+ 						             NM_VPN_PLUGIN_ERROR,