The aim of the presented work is to refine the ESP-r system by incorporating phase change materials (PCM) modelling. The behaviour of PCMs is modelled using ESP-r’s special materials facility. The effect of phase transition is added to the energy balance equation as a latent heat generation term according to the so-called effective heat capacity method. Numerical simulations were conducted for a multi-zone, highly glazed and naturally ventilated passive solar building. PCM impregnated gypsum plasterboard was used as an internal room lining. The air, surface and resultant temperatures were compared with the no-PCM case and the diurnal latent heat storage effect was analysed.