This paper explains how climate change may increase future migration, and which risks are associated with such migration. It also examines how some of this migration may enhance the capacity of communities to adapt to climate change. Climate change is likely to result in some increase above baseline rates of migration in the next 40 years. Most of this migration will occur within developing countries. There is little reason to think that such migration will increase the risk of violent conflict. Not all movements in response to climate change will have negative outcomes for the people that move, or the places they come from and go to. Migration, a proven development strategy, can increase the capacity of communities to adapt to climate change. The fewer choices people have about moving, however, the less likely it is that the outcomes of that movement will be positive. Involuntary resettlement should be a last resort. Many of the most dire risks arising from climate-motivated migration can be avoided through careful policy. Policy responses to minimize the risks associated with migration in response to climate change, and to maximize migration’s contribution to adaptive capacity include: ensuring that migrants have the same rights and opportunities as host communities; reducing the costs of moving money and people between areas of origin and destination; facilitating mutual understanding among migrants and host communities; clarifying property rights where they are contested; ensuring that efforts to assist migrants include host communities; and strengthening regional and international emergency response systems.