diff -r 7d7a2c721366 Python/ceval.c
--- a/Python/ceval.c	Wed Apr 15 10:09:10 2015 -0400
+++ b/Python/ceval.c	Wed Apr 15 11:25:47 2015 -0400
@@ -3826,8 +3826,8 @@
             /* Iterator done, via error or exhaustion. */
             if (!PyErr_Occurred()) {
                 PyErr_Format(PyExc_ValueError,
-                    "need more than %d value%s to unpack",
-                    i, i == 1 ? "" : "s");
+                    "not enough values to unpack (expected %d, got %d)",
+                    argcnt, i);
             }
             goto Error;
         }
@@ -3844,8 +3844,9 @@
             return 1;
         }
         Py_DECREF(w);
-        PyErr_Format(PyExc_ValueError, "too many values to unpack "
-                     "(expected %d)", argcnt);
+        PyErr_Format(PyExc_ValueError,
+            "too many values to unpack (expected %d)",
+            argcnt);
         goto Error;
     }
 
@@ -3857,8 +3858,9 @@
 
     ll = PyList_GET_SIZE(l);
     if (ll < argcntafter) {
-        PyErr_Format(PyExc_ValueError, "need more than %zd values to unpack",
-                     argcnt + ll);
+        PyErr_Format(PyExc_ValueError,
+            "not enough values to unpack (expected %zd, got %zd)",
+            argcnt + ll, argcntafter);
         goto Error;
     }