The current European energy crisis, caused to a large extent by the unlawful invasion of Ukraine by Russia, has renewed calls for a deep reform of the European electricity market. In this paper, we look at the alternatives proposed for the reform of the European electricity market, analysing their advantages and disadvantages, and we put forward a specific proposal for the reform. We focus mostly on measures directed at the wholesale generation market, although we also propose some changes that we believe will also be needed at the retail level. Emergency measures to tackle the current energy crisis, which are not necessarily consistent with the long-term reform and should definitely not determine the long-term design of the European electricity market, are very briefly assessed in an annex, including their compatibility with this long-term reform.