On May 8, the Senate passed, 90 – 4, S. 113, the Foreign Intelligence Surveillance bill “to amend the Foreign Intelligence Surveillance Act of 1978 (FISA) to cover individuals, other than United States persons, who engage in international terrorism without affiliation with an international terrorist group.”
See the text of the floor debate from the Congressional Record, via the terrific Federation of Amerian Scientists site (FAS) here. In addition, FAS has posted other important related resources as follows:

See also this New York Times article, Senate Deal Kills Effort to Extend Antiterror Act, Newsday’s Wiretap Bill Passes, as well as a compilation of my previous posting on FISA here.