Baking soda is the way to go as others have suggested
I personally prefer to add everything to the mash including roasted malts. Bru'n Water usually gets me within 0.10 for darker beers
I aim for a mash PH of 5.4 in Bru'n Water
Martin has advocated mashing at a higher PH than that, but I've...