Two of the greatest challenges currently facing humanity are the potential consequences of climate change and the actual consequences of reduced agricultural diversity. This paper considers the consequences of both climate change and reduced agricultural diversity on global food security and nutrition. The inextricable link between climate change and crop diversity is examined, particularly in the context of crop production in Africa where most agricultural diversity exists and where climate change will have most impact. The Green Revolution, often seen as a model for increasing global agricultural productivity, is reconsidered in terms of its failure to make a significant impact in hostile tropical environments such as those of much of Africa. An alternative or, at least, a complementary strategy, is advocated where we might better harness the huge repository of indigenous plant species cultivated and conserved by local communities for many generations across variable climates. An example is given of multidisciplinary research on bambara groundnut (Vigna subterranea), an ancient grain legume grown, cooked, processed and traded mainly by subsistence women farmers in sub-Saharan Africa. The experience gained on bambara groundnut is considered as a basis for similar efforts on many other potentially useful underutilised food crops in the climates of the future.