The first two caps recommended by uniserver are the incorrect form-factor, they should have axial leads, not radial leads.

Mk.588 has a good guide here: http://tinyurl.com/7r7jjor