\copyright 2017 IEEE. Today's advanced machine tool and manufacturing system engineering uses mechatronic, system-based modular kits in order to offer machines and manufacturing systems economically. The market increasingly requires not only an economical production of machine tools or manufacturing systems, but also the latest technology, for example, an upgrade or exchange of mechatronic modules. This is economically not possible due to the state of the art. This paper will present how mechatronic engineering can be developed into an engineering using cyber-physical systems (CPS). It will also present how engineering of machine tools and manufacturing systems will change in the future und which concepts can be realized.