A broad span of knowledge is needed to analyse the relationship between agriculture and climate change, from international or local governance, to stakeholders' practices, to biology and genomics. The uncertainty related to climate hazards complicates adaptation and mitigation strategies. It is essential for adaptation and mitigation not to be separated in practice, even where analysis does deal with them separately. Climate-smart innovations can be stimulated by analyses and participatory learning approaches, which are all the more necessary in that the scientific standards are very incomplete. To meet the challenges, innovative solutions as well as those already available will also require political, institutional and financial backing. Future research must come up with new climate-smart options to strengthen stakeholders' and systems' resilience and to create an environment conducive to change. Work on improving agricultural production alone will not be sufficient-the whole food system must be considered.