A method and apparatus for determining embedded runout correction values when self-servo writing or partial self-servo writing is disclosed. In one embodiment, a disk surface, which has servo information written thereon, is provided. The servo information is grouped into 1x servo sectors and 2x servo sectors, and the 1x servo sectors and the 2x servo sectors form a plurality of tracks. A read head servos on the 1x servo sectors associated with a track. Both position error signals due to repeatable runout for the 1x servo sectors and information related to position error signals due to repeatable runout for the 2x servo sectors are determined, while servoing on the 1x servo sectors. Embedded runout correction values for the 1x servo sectors and the 2x servo sectors are calculated.