Index: src/platform/Windows/OFSystemInfo+NetworkInterfaces.m
==================================================================
--- src/platform/Windows/OFSystemInfo+NetworkInterfaces.m
+++ src/platform/Windows/OFSystemInfo+NetworkInterfaces.m
@@ -47,11 +47,10 @@
 
 static OFMutableDictionary OF_GENERIC(OFString *, OFNetworkInterface) *
 networkInterfacesFromGetAdaptersAddresses(void)
 {
 	OFMutableDictionary *ret = [OFMutableDictionary dictionary];
-	OFStringEncoding encoding = [OFLocale encoding];
 	ULONG adapterAddressesSize = sizeof(IP_ADAPTER_ADDRESSES);
 	PIP_ADAPTER_ADDRESSES adapterAddresses;
 
 	if ((adapterAddresses = malloc(adapterAddressesSize)) == NULL)
 		return nil;
@@ -79,12 +78,12 @@
 		    iter != NULL; iter = iter->Next) {
 			OFString *name;
 			OFMutableDictionary *interface;
 			OFNumber *index;
 
-			name = [OFString stringWithCString: iter->AdapterName
-						  encoding: encoding];
+			name = [OFString stringWithFormat: @"%lu",
+							   iter->IfIndex];
 
 			if ((interface = [ret objectForKey: name]) == nil) {
 				interface = [OFMutableDictionary dictionary];
 				[ret setObject: interface forKey: name];
 			}
@@ -193,12 +192,11 @@
 			OFString *name, *IPString;
 			OFNumber *index;
 			OFSocketAddress IPv4Address;
 			OFData *addresses;
 
-			name = [OFString stringWithCString: iter->AdapterName
-						  encoding: encoding];
+			name = [OFString stringWithFormat: @"%u", iter->Index];
 
 			if ((interface = [ret objectForKey: name]) == nil) {
 				interface = [OFMutableDictionary dictionary];
 				[ret setObject: interface forKey: name];
 			}