The Marin Municipal Water District (MMWD) in Corte Madera experienced a particularly severe water shortage during California's six-year drought. Citizens were frustrated because the district rigidly limited consumption and repeatedly raised rates. As the drought was ending in 1992, MMWD assembled a citizen advisory committee to direct the district and a consulting firm in establishing a new rate structure. More than a cost-allocation exercise to meet financial needs, the planning process involved important policy issues that required public input. The marginal cost approach chosen meets revenue needs and addresses the problems of limited water supply and expensive source development to meet increased demand. Support for the rate structure is widespread because committee members, who represented most elements of the larger community, were able to reach broad consensus on most issues. Includes reference, tables.