Consideration of site conditions is a vital step in analyzing and predicting earthquake ground motion. The importance of amplification by soil conditions has long been recognized, but though many seismic-instrument sites have been characterized by their geologic conditions, there has been no consistent, simple classification applied to all sites. As classification of sites by shear-wave velocity has become more common, the need to go back and provide a simple uniform classification for all stations has become apparent. Within the Pacific Earthquake Engineering Research Center's Next Generation Attenuation equation project, developers of attenuation equations recognized the need to consider site conditions and asked that the California Geological Survey provide site conditions information for all stations that have recorded earthquake ground motion in California. To provide these estimates, we sorted the available shear-wave velocity data by geologic unit, generalized the geologic units, and prepared a map so that we could use the extent of the map units to transfer the velocity characteristics from the sites where they were measured to sites on the same or similar materials. This new map is different from the California Geological Survey "preliminary site-conditions map of California" in that 19 geologically defined categories are used, rather than National Earthquake Hazards Reduction Program categories. Although this map does not yet cover all of California, when completed it may provide a basis for more precise consideration of site conditions in ground-motion calculations.