This document summarizes a convening on climate change adaptation and African agriculture held in Ethiopia in 2011. It discusses the background of Ethiopia's agricultural research institutions and efforts to build their capacity to address climate issues. Key activities of a Rockefeller Foundation grant to mainstream climate change adaptation into agriculture include forming partnerships between research and educational institutions, providing training, developing communication tools, and assessing vulnerabilities and impacts. Challenges include the need for improved networking, capacity, and technologies to support climate-resilient agriculture. Lessons indicate a need to integrate climate considerations into all agriculture work and policies.