More gondor-specific package updates.