Retirement tax questions

When you enter the basis (nondeductible contribution amount) this should take care of it without needing a new 1099-R. Of course the earnings in the account that are converted will be taxable.