Plus one on the circlip, I had to get a pair of 'master cylinder circlip pliers' to get mine out. Rebuild itself is straightforward but be scrupulously clean and make sure everything goes back the same way.
If you don't fancy it Dave Silvers do an aftermarket replacement, doesn't look quite the same but does the job.