If I remember correctly, JRR Tolkien, author of the Lord of the Rings books, was the one who spelt it as 'dwarves', and he was appalled when the editors edited it to be spelt as 'dwarfs'. Also, he spelt the plural of 'elf' as 'elves', as opposed to elfs, which, I think, had been the accepted...