diff --git a/win32/n2n_win32.h b/win32/n2n_win32.h
index 3affaa3..8cddbb0 100644
--- a/win32/n2n_win32.h
+++ b/win32/n2n_win32.h
@@ -21,14 +21,19 @@
 #include <inttypes.h>
 #endif /* #if defined(__MINGW32__) */
 
+
 #include <winsock2.h>
 #include <windows.h>
-#include <winioctl.h>
-#include <iptypes.h>
+#include <ws2def.h>
+#include <ws2ipdef.h>
 #if defined(_MSC_VER)
 #include <Iphlpapi.h>
 #pragma comment(lib,"Iphlpapi.lib")
 #endif
+#include <netioapi.h>
+#include <winioctl.h>
+#include <iptypes.h>
+
 
 #include "wintap.h"
 
@@ -81,6 +86,7 @@ typedef struct tuntap_dev {
 	uint32_t        device_mask;
 	unsigned int    mtu;
 	unsigned int    metric;
+        unsigned int    metric_original;
 } tuntap_dev;
 
 
diff --git a/win32/wintap.c b/win32/wintap.c
index 0f9a497..e16ba49 100644
--- a/win32/wintap.c
+++ b/win32/wintap.c
@@ -339,16 +339,27 @@ int open_wintap(struct tuntap_dev *device,
 
   /* metric */
 
+  PMIB_IPINTERFACE_ROW Row;
+
   if(metric) { /* try to change only if a value has been given, otherwise leave with default or as set before */
+    // find & store original metric
+    Row = calloc(1, sizeof(MIB_IPINTERFACE_ROW));
+    InitializeIpInterfaceEntry(Row);
+    Row->InterfaceIndex = device->if_idx;
+    Row->Family = AF_INET;
+    GetIpInterfaceEntry(Row);
+
+    device->metric_original = Row->Metric;
     device->metric = metric;
 
-    _snprintf(cmd, sizeof(cmd),
-      "netsh interface ipv4 set interface \"%s\" metric=%d > nul",
-      device->ifName, device->metric);
+    // set new value
+    Row->Metric = metric;
 
-    if(system(cmd) != 0)
-      printf("WARNING: Unable to set device %s parameters metric=%d [%s]\n",
-        device->ifName, device->metric, cmd);
+    // store
+    Row->SitePrefixLength = 0; /* if not set to zero, following function call fails... */
+    SetIpInterfaceEntry(Row);
+    
+    free(Row);
   }
 
   /* ****************** */
@@ -443,6 +454,27 @@ int tuntap_open(struct tuntap_dev *device,
 /* ************************************************ */
 
 void tuntap_close(struct tuntap_dev *tuntap) {
+
+  PMIB_IPINTERFACE_ROW Row;
+
+  if(tuntap->metric) { /* only required if a value has been given (and thus stored) */
+    // find device entry
+    Row = calloc(1, sizeof(MIB_IPINTERFACE_ROW));
+    InitializeIpInterfaceEntry(Row);
+    Row->InterfaceIndex = tuntap->if_idx;
+    Row->Family = AF_INET;
+    GetIpInterfaceEntry(Row);
+
+    // restore original value
+    Row->Metric = tuntap->metric_original;
+
+    // store
+    Row->SitePrefixLength = 0; /* if not set to zero, following function call fails... */
+    SetIpInterfaceEntry(Row);
+
+    free(Row);
+  }
+
   CloseHandle(tuntap->device_handle);
 }