Foreign pension

I am a retired US citizen resident in Switzerland. I receive payments from the Swiss Retirement system (AHV: equivalent to US Social Security) and payments from my former Swiss employer's retirement plan. Both report annual payments in CHF for Swiss income tax reporting purposes.

In past years I have declared these incomes on substitute1099-Rs (and filled out form 4853) and used

00-0000000 as the Payer's Federal identification number for these payors. 2021 Turbotax Premier no longer accepts that work around.

So, how to declare this foreign income in TurboTax 2021?