The diplomatic corps are returning to Waitangi Day celebrations in Waitangi after shunning the event for years because of a series of ugly incidents in the past.
Prime Minister John Key said today it was "very significant" that the diplomats were coming back.
"I am looking forward to attending Waitangi Day celebrations this year with a number of ministers and MPs," Mr Key said.
"I am also pleased to see 60 members of the diplomatic corps will be joining New Zealanders at Waitangi this year and I am delighted that they will be marking this important day of celebration."
Many diplomats have not returned to Waitangi since former Governor-General Dame Catherine Tizard and others were jostled and spat on by protesters in 1995.
A traditional flashpoint for Maori discontent has seen many similar incidents since then.
Security around Mr Key is likely to be beefed up this time after he was assaulted last year.
While the Prime Minister does not generally comment on his security arrangements, he made it clear today that last year's events would have been taken into account.
John Junior Popata, 33, a researcher, and Wikatana Popata, 19, an interviewer, were convicted after the scuffle outside Te Tii Marae during which Mr Key, who already had a broken arm, was grabbed but not injured.
The brothers were each sentenced to 100 hours' community work.
Mr Key said the incident was a small part of what had overall been a festive occasion which he would be repeated this year.
"No doubt the weather will be better than what we have been getting here (Wellington) and no doubt the festive atmosphere and the unstinting hospitality will help to create a memorable and moving day," Mr Key said.
He will be in Waitangi on Friday and visit the Te Tii marae and a number of other functions.
On Saturday, he will attend the dawn service at the meeting house and host a breakfast for invited guests before returning to Auckland.