Renovating roofs of multi-family buildings with building integrated photovoltaics (BIPV) poses a possibility of cost effective installation of solar cells. The surplus electricity could however become a problem for the grid and decrease the profitability of the investment. In this study, the economical possibilities for a BIPV renovation and for batteries and a thermal storage to store the surplus electricity is evaluated. A study has been made for a multi-family building in Jönköping which is built within the time period of the Swedish Million Programme. Several cases were examined where the renovation was combined with installation of BIPV, a heat recovery system (HRV) or heat pump and a possibility of batteries and/or thermal storage. The management of surplus electricity was modelled and the net present value (NPV) for the cases as well as the value of energy storage was calculated. The NPV was positive for all the cases with BIPV renovation, which means that the BIPV renovation is profitable. The alternative cost for the renovation was seen to have a big impact on the profitability. Both the batteries and the thermal storage decreased the NPV and are therefore not profitable today. To increase the profitability of energy storage the investment cost must decrease and/or the energy prices increase. Other possibilities to increase the profitability of the investment was found; to make use of the different political support systems, or to have a group subscription where also the household electricity can be supplied by the solar production. / Miljontak - takrenovering med solceller