diff --git a/Python/import.c b/Python/import.c
index 37cfdeb..06350b7 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -81,6 +81,14 @@
 		fatal("duplicate initimport() call");
 	if ((import_modules = newdictobject()) == NULL)
 		fatal("no mem for dictionary of modules");
+	if (Py_OptimizeFlag) {
+		/* Replace ".pyc" with ".pyo" in import_filetab */
+		struct filedescr *p;
+		for (p = import_filetab; p->suffix != NULL; p++) {
+			if (strcmp(p->suffix, ".pyc") == 0)
+				p->suffix = ".pyo";
+		}
+	}
 }
 
 
@@ -202,7 +210,7 @@
 	if (len+2 > buflen)
 		return NULL;
 	strcpy(buf, pathname);
-	strcpy(buf+len, "c");
+	strcpy(buf+len, Py_OptimizeFlag ? "o" : "c");
 
 	return buf;
 }