diff --git a/Python/import.c b/Python/import.c
index 7725245..0eb44f2 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -149,10 +149,14 @@
 	
 	fp = open_module(name, ".py", namebuf);
 	if (fp == NULL) {
-		if (m == NULL)
-			err_setstr(NameError, name);
-		else
-			err_setstr(IOError, "no module source file");
+		if (m == NULL) {
+			sprintf(namebuf, "no module named %.200s", name);
+			err_setstr(ImportError, namebuf);
+		}
+		else {
+			sprintf(namebuf, "no source for module %.200s", name);
+			err_setstr(ImportError, namebuf);
+		}
 		return NULL;
 	}
 	/* Get mtime -- always useful */