A rapid and significant increase of renewable energies in Europe is necessary, both for decarbonising the energy system as well as for security of supply aspects. Rooftop solar installations have to be a substantial part of it, as they offer several advantages like avoiding additional land use, demand-side generation or opportunities for citizens to participate in the energy transition. Hence it should become standard that buildings are equipped with solar installations. An ambitious solar mandate is the most effective way to realize this and therefore the EU Commission's proposal to amend the Energy Performance of Buildings Directive (EPBD) with provisions for such a mandate is highly welcome. In the following we will discuss how the current suggestions should be adjusted and which additional elements should be considered.