Index: Modules/main.c
===================================================================
--- Modules/main.c (revision 60877)
+++ Modules/main.c (working copy)
@@ -268,6 +268,23 @@
 
 	cf.cf_flags = 0;
 
+#ifdef MS_WINDOWS
+    {
+        int i;
+        LPWSTR *wargv = CommandLineToArgvW(GetCommandLineW(), &argc);
+        argv = (char **)malloc(argc * sizeof(char*));
+
+        for (i = 0; i < argc; ++i)
+        {
+            int char_count = WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, NULL, 0, NULL, NULL);
+            argv[i] = (char *)malloc(char_count * sizeof(char*));
+            WideCharToMultiByte(CP_UTF8, 0, wargv[i], -1, argv[i], char_count, NULL, NULL);
+        }
+
+        LocalFree(wargv);
+    }
+#endif
+
 	orig_argc = argc;	/* For Py_GetArgcArgv() */
 	orig_argv = argv;