Updated from recent spksrc changes