@@ -26,11 +26,11 @@
 #endif
 
 #import "OFException.h"
 #import "OFString.h"
 #import "OFArray.h"
-#import "OFSystemInfo.h"
+#import "OFLocalization.h"
 
 #import "OFInitializationFailedException.h"
 #import "OFLockFailedException.h"
 #import "OFUnlockFailedException.h"
 
@@ -188,21 +188,21 @@
 #ifdef HAVE_STRERROR_R
 	if (strerror_r(errNo, buffer, 256) != 0)
 		return @"Unknown error (strerror_r failed)";
 
 	ret = [OFString stringWithCString: buffer
-				 encoding: [OFSystemInfo native8BitEncoding]];
+				 encoding: [OFLocalization encoding]];
 #else
 # ifdef OF_HAVE_THREADS
 	if (!of_mutex_lock(&mutex))
 		@throw [OFLockFailedException exception];
 
 	@try {
 # endif
 		ret = [OFString
 		    stringWithCString: strerror(errNo)
-			     encoding: [OFSystemInfo native8BitEncoding]];
+			     encoding: [OFLocalization encoding]];
 # ifdef OF_HAVE_THREADS
 	} @finally {
 		if (!of_mutex_unlock(&mutex))
 			@throw [OFUnlockFailedException exception];
 	}