Use freeciv trunk r22791