Happy day....nice to find an old issue to re-use.  A client receives a 1099-R with code 7 and the IRA box marked.  The preparer and....ahem....reviewer...confirmed that it was a conversion, but failed to mark the B5 box on the 1099-R worksheet, resulting in lines 16-18 on the 8606 having no amounts. 

When I mark the B5 box, the 8606 correctly populates.  There is no change in tax.  The instructions for amending the 8606 are not precisely clear for our circumstance.  Options:

1. Efile the 1040X with zero tax change and be sure the 8606 is filed with it

2. Sign and mail the 8606.

And so, I ask you, the amazing people of this forum...what is the appropriate course of action?