Retirement service credit for service as a midshipman at the United States Merchant Marine Academy

(a) Civil service retirement system Section 8331(13) of title 5, United States Code, is amended, in the flush text following subparagraph (C), by inserting or the United States Merchant Marine Academy after Naval Academy. (b) Federal employees’ retirement system Section 8401(31) of title 5, United States Code, is amended, in the flush text following subparagraph (C), by inserting or the United States Merchant Marine Academy after Naval Academy. (c) Applicability The amendments made by this section shall apply to— (1) any annuity, the eligibility for which is based on a separation occurring before, on, or after the date of enactment of this Act; and (2) any period of service as a midshipman at the United States Merchant Marine Academy occurring before, on, or after the date of enactment of this Act.