Ground source heat pump systems have been proved to be one of the most efficient systems for heating and cooling in buildings. However, an optimal energy performance depends on a good control of the auxiliaries, which stand for an important part of the total energy consumption. The authors previously developed an experimental in situ optimization methodology for the water circulation pumps frequency of ground source heat pump systems when single stage and multi-stage ON/OFF regulation is employed. However, the user comfort was not completely met under extreme weather conditions during summer. This paper presents the upgrading of this energy optimization strategy combining circulation pumps frequency variation and building supply temperature compensation in order to ensure the user comfort while keeping high energy savings. Experimental results show that the user comfort is met by means of this new methodology and the energy savings (33%) are even higher than those obtained with the previous methodology. (C) 2015 Elsevier B.V. All rights reserved.