I am somewhat skeptical that either the ACLU or EFF are effective organizations for this cause. The ACLU in particular have drifted significantly from a civil liberties focus, and EFF's privacy track-record for corporate run surveillance has never been the best and of late they seem to be following the ACLU away from civil liberties.