@@ -39,11 +39,11 @@
 #import "OFProcess.h"
 #import "OFString.h"
 #import "OFArray.h"
 #import "OFDictionary.h"
 #import "OFDataArray.h"
-#import "OFSystemInfo.h"
+#import "OFLocalization.h"
 
 #import "OFInitializationFailedException.h"
 #import "OFOutOfRangeException.h"
 #import "OFReadFailedException.h"
 #import "OFWriteFailedException.h"
@@ -147,12 +147,11 @@
 
 		if (pipe(_readPipe) != 0 || pipe(_writePipe) != 0)
 			@throw [OFInitializationFailedException
 			    exceptionWithClass: [self class]];
 
-		path = [program cStringWithEncoding:
-		    [OFSystemInfo native8BitEncoding]];
+		path = [program cStringWithEncoding: [OFLocalization encoding]];
 		[self OF_getArgV: &argv
 		  forProgramName: programName
 		    andArguments: arguments];
 
 		@try {
@@ -348,11 +347,11 @@
 	of_string_encoding_t encoding;
 
 	*argv = [self allocMemoryWithSize: sizeof(char*)
 				    count: count + 2];
 
-	encoding = [OFSystemInfo native8BitEncoding];
+	encoding = [OFLocalization encoding];
 
 	(*argv)[0] = (char*)[programName cStringWithEncoding: encoding];
 
 	for (i = 0; i < count; i++)
 		(*argv)[i + 1] =
@@ -369,11 +368,11 @@
 	of_string_encoding_t encoding;
 
 	if (environment == nil)
 		return NULL;
 
-	encoding = [OFSystemInfo native8BitEncoding];
+	encoding = [OFLocalization encoding];
 
 	count = [environment count];
 	envp = [self allocMemoryWithSize: sizeof(char*)
 				   count: count + 1];