Do not enter the 2020 contribution into the program for 2021. You should have entered in in 2020. Since your goal is to have an accurate 8606, you need to fill out an 8606 for 2020 and mail it in separately. See f8606--2020.pdf - Internal Revenue Service and 2020 Instructions for Form 8606 - Internal Revenue Service
**Say "Thanks" by clicking the thumb icon in a post
**Mark the post that answers your question by clicking on "Mark as Best Answer"
