Performing embedded runout correction for a track on a rotational data storage disk includes measuring written-in runout for the track, selecting a number of revolutions in response to the measured written-in runout of the track, calculating embedded correction values for the track for the selected number of revolutions of the rotational data storage disk, and storing the embedded correction values.