Today, in 2016, solar PV (photovoltaics) is an attractive energy option for households. The present financial viability is due on the one hand to the substantial decrease in the investment costs of solar panels and on the other to the relatively high kWh tariffs resulting from the current feed-in scheme. If this scheme is abolished or phased out, as announced by Minister Kamp, without compensatory measures the financial viability of solar PV will change dramatically. This study considers the options for storing auto-generated power in boilers for domestic warm tap-water supply. Overall, this concept for storing auto-generated surplus proves to have potential, with scope for optimizing both technological and dimensioning aspects.