One of the first post-focus instruments of the new solar telescope GREGOR will be a Fabry-Perot spectrometer, which is an upgrade of the Göttingen Fabry-Perot interferometer at the Vacuum Tower Telescope (VTT) on Tenerife. This spectrometer is equipped with a full-Stokes polarimeter. The modulation is performed with two ferroelectric liquid crystals, one acting nominally as quarter-wave plate, and the other as half-wave plate. A modified Savart plate serves as polarimetric beam splitter. With the present liquid crystals, the optimum wavelength range of this polarimeter is between 580 and 660 nm. The spectro-polarimeter will benefit from the capabilities of the new telescope GREGOR which will provide a spatial resolution of about 0″.1 (75 km on the solar surface). Thus we will be able to investigate small magnetic features, and we will study their development with high cadence.