To avoid engine idling to support cabin heating, an auxiliary coolant heater can heat engine coolant and pump it through compartment heaters or the engine cooling system. The coolant flow control system provides great flexibility in selectively distributing heated coolant for heating and engine preheating.