With an increasing fluctuation of energy supply due to the integration of renewable energy utilities peak-shaving becomes more and more important. Storage systems are a considerable option for this purpose. For the heat supply in cities the buildings themselves can be employed as solid thermal energy storages utilizing their thermal inertia and applying an operation strategy which takes into account comfort, economic and ecologic considerations. Therefore the present work proposes a MILP (Mixed Integer Linear Programing) model accounting for the system's dynamics to optimize this operation strategy and the according comfort temperature, by taking into account a dynamic effect of the building. The dynamic effect considers that the building can be charged/discharged to a certain degree, depends on the effective heat capacity of the building and the indoor comfort temperature. In order to properly account for the temperature, the model incorporates energy integration techniques. By means of a test case it is shown that the primary energy consumption and the operating expenses can be decreased when operating the building within a given range for the comfort temperature. (C) 2015 Elsevier Ltd. All rights reserved.