In this paper, a modelling technique for simulating self-propelled ships in waves is presented. The flow is modelled using a RANS solver coupled with an actuator disk model for the propeller. The motion of the ship is taken into consideration in the definition of the actuator disk region as well as the advance ratio of the propeller. The RPM of the propeller is controlled using a PID-controller with constraints added on the maximum permissible RPM increase rate. Results are presented for a freely surging model in regular waves with different constraints put on the PID-controller. The described method shows promising results and allows for the studying of several factors relating to selfpropulsion. However, more validation data is needed to judge the accuracy of the model.