@@ -229,11 +229,11 @@
 		if (env != NULL) {
 			for (; *env != NULL; env++) {
 				OFString *key, *value;
 				char *sep;
 				const of_string_encoding_t encoding =
-				    OF_STRING_ENCODING_NATIVE;
+				    [OFString nativeOSEncoding];
 
 				pool = objc_autoreleasePoolPush();
 
 				if ((sep = strchr(*env, '=')) == NULL) {
 					fprintf(stderr, "Warning: Invalid "
@@ -326,23 +326,24 @@
 {
 #ifndef _WIN32
 	void *pool = objc_autoreleasePoolPush();
 	OFMutableArray *arguments;
 	int i;
+	of_string_encoding_t encoding;
 
 	_argc = argc;
 	_argv = argv;
 
-	_programName = [[OFString alloc]
-	    initWithCString: (*argv)[0]
-		   encoding: OF_STRING_ENCODING_NATIVE];
+	encoding = [OFString nativeOSEncoding];
+
+	_programName = [[OFString alloc] initWithCString: (*argv)[0]
+						encoding: encoding];
 	arguments = [[OFMutableArray alloc] init];
 
 	for (i = 1; i < *argc; i++)
-		[arguments addObject:
-		    [OFString stringWithCString: (*argv)[i]
-				       encoding: OF_STRING_ENCODING_NATIVE]];
+		[arguments addObject: [OFString stringWithCString: (*argv)[i]
+							 encoding: encoding]];
 
 	[arguments makeImmutable];
 	_arguments = arguments;
 
 	objc_autoreleasePoolPop(pool);