Index: src/platform/Windows/OFSystemInfo+NetworkInterfaces.m
==================================================================
--- src/platform/Windows/OFSystemInfo+NetworkInterfaces.m
+++ src/platform/Windows/OFSystemInfo+NetworkInterfaces.m
@@ -40,11 +40,10 @@
 
 	if ((module = GetModuleHandle("iphlpapi.dll")) != NULL)
 		GetAdaptersAddressesFuncPtr = (WINAPI ULONG (*)(ULONG, ULONG,
 		    PVOID, PIP_ADAPTER_ADDRESSES, PULONG))
 		    GetProcAddress(module, "GetAdaptersAddresses");
-
 }
 
 static OFMutableDictionary OF_GENERIC(OFString *, OFNetworkInterface) *
 networkInterfacesFromGetAdaptersAddresses(void)
 {
@@ -54,10 +53,11 @@
 
 	if ((adapterAddresses = malloc(adapterAddressesSize)) == NULL)
 		return nil;
 
 	@try {
+		OFStringEncoding encoding = [OFLocale encoding];
 		ULONG error = GetAdaptersAddressesFuncPtr(AF_UNSPEC, 0, NULL,
 		    adapterAddresses, &adapterAddressesSize);
 
 		if (error == ERROR_BUFFER_OVERFLOW) {
 			PIP_ADAPTER_ADDRESSES newAdapterAddresses =
@@ -78,12 +78,12 @@
 		    iter != NULL; iter = iter->Next) {
 			OFString *name;
 			OFMutableDictionary *interface;
 			OFNumber *index;
 
-			name = [OFString stringWithFormat: @"%lu",
-							   iter->IfIndex];
+			name = [OFString stringWithCString: iter->AdapterName
+						  encoding: encoding];
 
 			if ((interface = [ret objectForKey: name]) == nil) {
 				interface = [OFMutableDictionary dictionary];
 				[ret setObject: interface forKey: name];
 			}