The WTO Agreement on Agriculture was designed to maximize trade flows at a time of surplus agricultural production. It required Members to open markets and to reduce domestic and export subsidies. Proposals for reform in the Doha Round negotiations largely adopt the same pattern. Yet, as surplus is replaced by shortage, Members are increasingly concerned about food security and the impact of agriculture on climate change. And contemporary agricultural policies crystallize around ‘sustainable intensification’, where domestic production is promoted, but not at the expense of future production. This article suggests that, although both the Agreement on Agriculture and the Doha Round proposals do provide some scope for measures to address this new policy paradigm, there are instances where they may work actively against it.