Yeah, the handbooks confirmed it as him, but I've found one appearance site that lists him and Shaman in #6 too.