This document summarizes a land and water workshop held in Ethiopia from June 15-16, 2015 that took a rights-based approach to land and water governance in Africa. It discusses Oxfam's work on women's land rights, land tenure governance, responses to large-scale land investments, and engagement with partners like the African Union. It also outlines Oxfam's Global Water Governance Program focusing on the Mekong, Indus, and Limpopo river basins, and challenges in the Limpopo basin like unequal water access. Oxfam's solutions for the Limpopo include capacity building, linking communities, documenting best practices, and influencing policies to achieve more inclusive water governance.