diff -r 6ccb04c4cbae Objects/longobject.c
--- a/Objects/longobject.c	Fri Sep 28 01:15:39 2012 -0700
+++ b/Objects/longobject.c	Fri Sep 28 12:13:21 2012 +0100
@@ -1991,7 +1991,7 @@
 
     if ((base != 0 && base < 2) || base > 36) {
         PyErr_SetString(PyExc_ValueError,
-                        "int() arg 2 must be >= 2 and <= 36");
+                        "int() base must be >= 2 and <= 36, or 0");
         return NULL;
     }
     while (*str != '\0' && isspace(Py_CHARMASK(*str)))
@@ -4270,7 +4270,7 @@
         return NULL;
     if (overflow || (base != 0 && base < 2) || base > 36) {
         PyErr_SetString(PyExc_ValueError,
-                        "int() arg 2 must be >= 2 and <= 36");
+                        "int() base must be >= 2 and <= 36, or 0");
         return NULL;
     }