The NSA whistleblower appeared at TED today via a video chatbot and issued a call to arms when he said, “To people who have seen and enjoyed the free and open internet, it’s up to us to preserve that liberty for the next generation to enjoy.”

That echoed comments Snowden made over a video stream during SXSW in Austin, Texas, when he said, “[T]he people who are in the room at Austin right now, they’re the folks who can really fix things, who can enforce our rights for technical standards even when Congress hasn’t yet gotten to the point of creating legislation that protect our rights in the same manner. There’s a policy response that needs to occur, but there’s also a technical response that needs to occur. And it’s the makers, the thinkers, the developing community that can really craft those solutions to make sure we’re safe.”

With that in mind, WIRED consulted with experts to compile this list of 10 measures tech companies should adopt to protect customer data, whether it resides on a distant corporate server or is making its way across the Internet. The Electronic Frontier Foundation has a running scorecard tracking which companies are already employing some of these items on our wish list.