@@ -36,10 +36,11 @@
 #import "OFProcess.h"
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFDictionary.h"
 #import "OFDataArray.h"
+#import "OFSystemInfo.h"
 
 #import "OFInitializationFailedException.h"
 #import "OFOutOfRangeException.h"
 #import "OFReadFailedException.h"
 #import "OFWriteFailedException.h"
@@ -146,11 +147,11 @@
 			of_string_encoding_t encoding;
 
 			argv = [self allocMemoryWithSize: sizeof(char*)
 						   count: count + 2];
 
-			encoding = [OFString nativeOSEncoding];
+			encoding = [OFSystemInfo native8BitEncoding];
 
 			argv[0] = (char*)[programName
 			    cStringWithEncoding: encoding];
 
 			for (i = 0; i < count; i++)
@@ -311,11 +312,11 @@
 	of_string_encoding_t encoding;
 
 	if (environment == nil)
 		return NULL;
 
-	encoding = [OFString nativeOSEncoding];
+	encoding = [OFSystemInfo native8BitEncoding];
 
 	count = [environment count];
 	envp = [self allocMemoryWithSize: sizeof(char*)
 				   count: count + 1];