'make update' to 2.1.5 fails on 'Updating Usenet watermarks'

[Jmoraragweed]

Updating from 2.1.4 release to 2.1.5 release, during
make install, it dies on:

Updating Usenet watermarks
- nothing to update here
Nothing to do.
updating old qfiles
Traceback (most recent call last):
  File "bin/update", line 780, in ?
    errors = main()
  File "bin/update", line 709, in main
    update_qfiles()
  File "bin/update", line 441, in update_qfiles
    msg, data = dequeue(filebase)
  File "bin/update", line 497, in dequeue
    msg = cPickle.load(msgfp)
EOFError
make: *** [update] Error 1

This should preferably die gracefully or report the
invalid file for further investigation.

[http://sourceforge.net/tracker/index.php?func=detail&aid=960181&group_id=103&atid=100103]