Investors & landlords

If you have what IRS calls "satisfactory evidence" of your non-deductible contributions, you can update your current 8606 to show the correct basis.
If IRS questions you, you will have to produce that evidence.