I've been adding tons of ingredients, malts, extracts and yeast to the database to keep it up to date with what's available today. It's free and you can download it with the link below
qBrew - Homebrewers Recipe Calculator
I've added additional support for non-Windows users and there's even a video tutorial to help you get started. qBrew is easy to use and perfect for doing basic what-if recipe calculations.