The only part of the patch I don't like is the hard-coding of the timestamp. I don't have a better idea, but before I apply this I'm going to see if upstream has any suggestions. I'll include in that bug report the other two fixes which look good.
pgpypITBp1bsR.pgp
Description: OpenPGP digital signature
