This paper presents an automated fit for a control-oriented physics-based diesel engine combustion model. This method is based on the combination of a dedicated measurement procedure and structured approach to fit the required combustion model parameters. Only a data set is required that is considered to be standard for engine testing. The potential of the automated fit tool is demonstrated for two different heavy-duty diesel engines. This demonstrates that the combustion model and model fit methodology is not engine specific. Comparison of model and experimental results shows accurate prediction of in-cylinder peak pressure, IMEP, CA10, and CA50 over a wide operating range. This makes the model suitable for closed-loop combustion control development. However, NO emission prediction has to be improved.