In many parts of the developing world, drinking water is collected from unsafe surface sources outside the home and is then held in household storage vessels. Drinking water may be contaminated at the source or during storage; strategies to reduce waterborne disease transmission must safeguard against both events. We describe a two-component prevention strategy, which allows an individual to disinfect drinking water immediately after collection (point-of-use disinfection) and then to store the water in narrow-mouthed, closed vessels designed to prevent recontamination (safe storage). New disinfectant generators and better storage vessel designs make this strategy practical and inexpensive. This approach empowers households and communities that lack potable water to protect themselves against a variety of waterborne pathogens and has the potential to decrease the incidence of waterborne diarrheal disease.