The paper aims to promote the increased focus on governance dimension of water-related issues, and the value of investing in development of institutions that balance water demand and supply, and that mediate between the claims of competing users for inclusive and sustainable water management. Water governance determines the equity and efficiency in water resource and services allocation and distribution, and balances water use between various socioeconomic activities, and between those and ecosystems. Strengthening water governance for agriculture and food security means enabling effective problem-solving to produce policies and institutions related to water use and management that are regarded as legitimate by all relevant actors. The combination of technical and governance analyses has the potential to help decision-makers identify the most appropriate ways to achieve water efficiency, productivity, and sustainability, while at the same time increasing the capacity of agricultural productivity to end hunger, food insecurity and malnutrition. This paper provides practical guidance to undertake an in-depth water governance analysis at country and subnational levels and to develop technically valid and politically feasible strategies for change. With its emphasis on continual learning and adaptation, water governance analyses will help policy practitioners work in a more informed and politically sensitive way towards more sustainable, efficient, and equitable water use, guaranteeing social and economic sustainability for all users.