Water inequalities and extreme weather events are putting food security and peace at high risk. These tensions, already present, are only going to increase with a changing climate. Water and the access to it, is seen as the main reason for conflicts in the future. As a major consumer of water, agriculture is deeply implicated in this concern and should therefore be involved in the elaboration of solutions regarding water stress response. This article briefly explores the means of measurement and the possibilities that need to be considered to face the challenges of tomorrow. How can agriculture be more than a mere receiver of solutions to continue functioning, but an active part of the solution process itself?