The first thing to do is file Form 4868 now, before April 15. OR file your tax return by April 15.
That gives you until Oct 15 to straighten this out, however you decide to do it.
@marney
Note: If you fix it after you file, you would have to amend.
