I love riddles, but I rarely use them; riddles grind on some players' patience and I'm firmly against the idea of "make your save to solve the riddle." No intelligence checks here. When I use them I try to put the solution out there somewhere they can find through exploration or role-playing.