A future proof consumer law can no longer be solely focused on the economic interests of consumers, but should also endeavour sustainability in order to reconcile the aims of Article 11 TFEU (sustainable development) and 12 TFEU (consumer protection). This contribution analyses one particular way to contribute to a more sustainable consumer law: repair. Repair can contribute to a more circular economy but is currently not always the preferred option. A mix of policy measures could overcome obstacles to obtain repair from the seller under the legal and commercial guarantee as well as obstacles for do-it-yourself (‘DIY’) or independent repair.