Borges is pretty great. His non-fiction is generally pretty great, too. He wrote for a long time, so he has a lot of not so great stuff in both his fiction and non-fiction, though.
EDIT: The Garden of Forking Paths is one of my favorite pieces of fiction ever. Tlon Uqbar Orbis Tertius is up there, too.