diff --git a/Python/errors.c b/Python/errors.c
index 3b7d4a1..d61af3b 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -180,10 +180,10 @@
 	case E_OK:
 		break;
 	case E_SYNTAX:
-		err_setstr(ValueError, "syntax error");
+		err_setstr(SyntaxError, "invalid syntax");
 		break;
 	case E_TOKEN:
-		err_setstr(ValueError, "illegal token");
+		err_setstr(SyntaxError, "invalid token");
 		break;
 	case E_INTR:
 		err_set(KeyboardInterrupt);
@@ -192,10 +192,10 @@
 		err_nomem();
 		break;
 	case E_EOF:
-		err_set(EOFError);
+		err_setstr(SyntaxError, "unexpected EOF");
 		break;
 	default:
-		err_setstr(SystemError, "unknown input error");
+		err_setstr(SystemError, "unknown parsing error");
 		break;
 	}
 }