I like your suggestion better, there's probably no need to try to match the kernel exactly.