Abstract. The implementation of a resistive-wall extension to the non-linear MHD-code JOREK via a coupling to the vacuum-field code STARWALL is presented along with first applications and benchmark results. Also, non-linear saturation in the presence of a resistive wall is demonstrated. After completion of the ongoing verification process, this code extension will allow to perform non-linear simulations of MHD instabilities in the presence of three-dimensional resistive walls with holes for limited and X-point plasmas. 1