@@ -1958,10 +1958,16 @@ delete_route_ipv6 (const struct route_ipv6 *r6, const struct tuntap *tt, unsigne

     argv_printf_cat (&argv, "METRIC %d", r->metric);

 #endif

+  /* Windows XP to 7 "just delete" routes, wherever they came from, but

+   * in Windows 8(.1?), if you create them with "store=active", this is

+   * how you should delete them as well (pointed out by Cedric Tabary)

+   */

+  argv_printf_cat( &argv, " store=active" );

+

   argv_msg (D_ROUTE, &argv);

   netcmd_semaphore_lock ();

-  openvpn_execve_check (&argv, es, 0, "ERROR: Windows route add ipv6 command failed");

+  openvpn_execve_check (&argv, es, 0, "ERROR: Windows route delete ipv6 command failed");

   netcmd_semaphore_release ();

 #elif defined (TARGET_SOLARIS)

@@ -5305,10 +5305,14 @@ close_tun (struct tuntap *tt)

 	  /* remove route pointing to interface */

 	  delete_route_connected_v6_net(tt, NULL);

+	  /* "store=active" is needed in Windows 8(.1) to delete the

+	   * address we added (pointed out by Cedric Tabary).

+	   */

+

 	  /* netsh interface ipv6 delete address \"%s\" %s */

 	  ifconfig_ipv6_local = print_in6_addr (tt->local_ipv6, 0,  &gc);

 	  argv_printf (&argv,

-		    "%s%sc interface ipv6 delete address %s %s",

+		    "%s%sc interface ipv6 delete address %s %s store=active",

 		     get_win_sys_path(),

 		     NETSH_PATH_SUFFIX,

 		     tt->actual_name,