1. Climate change is projected to increase water-related risks like water shortages and floods through changes in water quantity and quality. This poses challenges for the agriculture sector. 2. Adaptation options like improving water storage, irrigation systems, and rainfed agriculture as well as policies around trade, population growth, and pollution management need to be comprehensively assessed to address impacts on water availability, agricultural production, and food security under climate change. 3. Both water-based technical solutions and non-water policy options will be important to manage the growing problems of water variability, scarcity, and degradation exacerbated by climate change and socioeconomic development.