To amend the Detainee Treatment Act of 2005 and title 18, United States Code, to include waterboarding in the definition of cruel, inhuman, or degrading treatment or punishment and in the definition of torture, and for other purposes.

Amends the Detainee Treatment Act of 2005 and the federal criminal code to include waterboarding (simulated drowning) within the definitions of cruel, inhuman, or degrading treatment or punishment, and torture.

Includes individuals under the custody or physical control of the Central Intelligence Agency (CIA) within the protection against cruel, inhuman, or degrading treatment or punishment by the government.