port to time-1.5

ehem... you might want to consider using pvp ;-)