More like 5 billion for Both
http://www.spaceref.com/news/viewnews.html?id=583
The budget for the ISS and the shuttle flights to support it is almost 5 billion. The shuttle takes up about two thirds though so we can't just wait on ISS completion to free up funds as I thought. It will take additional funding or significant cuts to other programs. I still think this is doable. A 20 %increase to NASA's budget is still < 0.02 % of the budget.
Regards,
Mark