@@ -24,10 +24,11 @@
 
 #import "OFApplication.h"
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFDictionary.h"
+#import "OFSystemInfo.h"
 #import "OFRunLoop.h"
 #import "OFRunLoop+Private.h"
 #import "OFThread.h"
 #import "OFThread+Private.h"
 
@@ -232,11 +233,11 @@
 		if (env != NULL) {
 			for (; *env != NULL; env++) {
 				OFString *key, *value;
 				char *sep;
 				const of_string_encoding_t encoding =
-				    [OFString nativeOSEncoding];
+				    [OFSystemInfo native8BitEncoding];
 
 				pool = objc_autoreleasePoolPush();
 
 				if ((sep = strchr(*env, '=')) == NULL) {
 					fprintf(stderr, "Warning: Invalid "
@@ -334,11 +335,11 @@
 	of_string_encoding_t encoding;
 
 	_argc = argc;
 	_argv = argv;
 
-	encoding = [OFString nativeOSEncoding];
+	encoding = [OFSystemInfo native8BitEncoding];
 
 # ifndef OF_NINTENDO_DS
 	if (*argc > 0) {
 # else
 	if (__system_argv->argvMagic == ARGV_MAGIC &&