An apparatus and method for correcting for the polarization mode distortion of an optical signal is described. The optical data signal to be transmitted is processed by a switch configured to place the signal into a plurality of polarization states on a periodic basis. At the receiving end of the system, a portion to the signal is coupled to a polarimeter and the wavelength-dependent state of polarization (SOP) of the received signal determined for the plurality of polarization states imposed on the transmitted signal. The data for two of the transmitted polarization states is selected to be used as the basis for correcting the SOP so as to compensate for the wavelength dependence thereof. The corrections may be applied in an optical pulse shaper.