Windsurfing will remain in the Olympic programme after the International Sailing Federation reversed a decision to replace it with kiteboarding.
Both men's and women's windsurfing will be retained after a vote at the governing body's annual general meeting in Ireland. Kiteboarding is now back on the outer.
The reversal comes after a surprise decision in May to drop windsurfing for kiteboarding at the 2016 Olympics.
New Zealand has won seven medals since boardsailing was introduced into the Olympics in 1984.
