For SwissFEL a new undulator has been developed and is built with local industry partners. The prototype will be delivered to PSI in february 2013. The undulator support has a modular concept and can host planar in and out of vacuum magnet arrays as well as APPLE II type structures. The closed frame is made of cast mineral with a wedge-based gap drive system. For SwissFEL 12 hard x-ray beamline ARAMIS 12 undulators U15 will be built until 2016, followed by 6 planar U40 and 9 APPLE II type UE40 undulators for the soft x-ray beamline ATHOS.