Just as a warning, upgraded last weekend and experienced some weird crashes... the diagnostic was not enough memory (though the previous version was working fine).

What I did is limit the number of children for amavisd from 10 to 4 (since it's for a small install). From the memory usage logs, it would seem that each child was taking close to 100 megs of ram...