I just used H&R to file since they have form 8936 for some time now. If they have it you have no excuse not to!
