A rotor for an electric machine, comprising a modular design consisting of a plurality of modular elements is disclosed. These modules are arranged adjacent to each other in a direction of movement of the rotor. Each modular element has at least one magnet and at least one ferromagnetic pole shoe, and the poles of the magnet are aligned in the direction of movement of the rotor. An electric machine comprising a stator and a rotor according to the invention is also disclosed.