diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index 751d147..2b4c6b4 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -969,6 +969,9 @@
 void
 PySys_SetArgv(int argc, char **argv)
 {
+#ifdef MS_WINDOWS
+	char fullpath[MAX_PATH];
+#endif
 	PyObject *av = makeargvobject(argc, argv);
 	PyObject *path = PySys_GetObject("path");
 	if (av == NULL)
@@ -1011,6 +1014,15 @@
 #if SEP == '\\' /* Special case for MS filename syntax */
 		if (argc > 0 && argv0 != NULL) {
 			char *q;
+#ifdef MS_WINDOWS
+			char *ptemp;
+			if (GetFullPathName(argv0,
+					   sizeof(fullpath),
+					   fullpath,
+					   &ptemp)) {
+				argv0 = fullpath;
+			}
+#endif
 			p = strrchr(argv0, SEP);
 			/* Test for alternate separator */
 			q = strrchr(p ? p : argv0, '/');