A bill to require a more reasonable period for delayed-notice search warrants, to provide enhanced judicial review of FISA orders and national security letters, to require an enhanced factual basis for a FISA order, and to create national security letter sunset provisions.

Amends the federal criminal code to: (1) reduce from 30 to seven days after the issuance of a warrant the period in which notice must be given to the subject of the warrant that it was issued to search for and seize any property or material that constitutes evidence of a criminal offense; and (2) repeal provisions treating as conclusive the certification of the Attorney General or the Director of the Federal Bureau of Investigation that certain disclosures of information endanger national security.

Amends the Foreign Intelligence Surveillance Act (FISA) to: (1) authorize judicial review of nondisclosure orders (orders prohibiting persons from disclosing that the Federal Bureau of Investigation (FBI) has sought information); (2) repeal the requirement prohibiting judicial review of production or nondisclosure orders until one year after such order.

Requires a production order (an order from the FBI Director to produce any tangible thing, such a book, document, or record) to either: (1) pertain to a foreign power, agent of a foreign power, or an individual in contact with, or known to, a suspected agent of a foreign power; or (2) be relevant to the activities of a suspected agent of a foreign power who is the subject of the authorized investigation.

Amends the USA PATRIOT Improvement and Reauthorization Act of 2005 to sunset, as of December 31, 2009, the national security letter authority provisions added to the federal criminal code, the Fair Credit Reporting Act, the Right to Financial Privacy Act, and the National Security Act of 1947.