The European Water Framework Directive (WFD) is one of the most analyzed environmental legislations in the scientific literature, influencing the water management in some non-European countries. The WFD has the strong ambition of achieving a good ecological status of water bodies across all river basins in Europe. However, the advances towards sustainable management are falling far behind the planned schedule. The emphasis of the Directive is focused on water quality rather than on water quantity. The advances during the last quarter of the century since its inception have been strong on urban and industrial point pollution, but not on agricultural non-point pollution that remains high and even increases in major basins. Water quantity aspects have been mostly left aside in the Directive, despite the fact that water scarcity is a serious problem in Southern European countries, and will become more critical with climate change in most basins across Europe. Some policy measures of the WFD need to be reformed, in particular measures for abating agricultural pollution, and new measures for addressing water scarcity. The narrow focus of the WFD on water pricing to solve at the same time issues of financing, water allocation and efficiency, environment, opportunity costs and pollution abatement, should be broadened. The challenge is giving more emphasis to command & control and collective action instruments, and designing combinations of instruments adapted to sectoral and spatial locations in basins. This overhaul of the water policy instruments by the European Commission will be needed to advance in the sustainable management of river basins in Europe.