Growing demand for agricultural commodities for food, fuel and other uses is expected to be met through an intensification of production on lands that are currently under cultivation. Intensification typically entails investments in modern technology — such as irrigation or fertilizers — and increases in cropping frequency in regions suitable for multiple growing seasons. Here we combine a process-based crop water model with maps of spatially interpolated yields for 14 major food crops to identify potential differences in food production and water use between current and optimized crop distributions. We find that the current distribution of crops around the world neither attains maximum production nor minimum water use. We identify possible alternative configurations of the agricultural landscape that, by reshaping the global distribution of crops within current rainfed and irrigated croplands based on total water consumption, would feed an additional 825 million people while reducing the consumptive use of rainwater and irrigation water by 14% and 12%, respectively. Such an optimization process does not entail a loss of crop diversity, cropland expansion or impacts on nutrient and feed availability. It also does not necessarily invoke massive investments in modern technology that in many regions would require a switch from smallholder farming to large-scale commercial agriculture with important impacts on rural livelihoods.