"Any professional tax software is going to generate Form 8606 for a non-deductible contribution."
Thats what my assumption is. I used HRBlock (though asking question on TT forum). The only problem is I lost my documents(I filed offline using HRB software, and not online) AND IRS transcript does not show form 8606.
But to be on safer side, I will file 1040-X with 8606 twice (one for me and one for my spouse). Hope after sending these docs, I will able to see 8606 also, on the IRS transcripts on my online account @ IRS
