An inmate has been charged over a hostage incident at the maximum security wing of Auckland Prison at Paremoremo.
Police say a 28-year-old has been charged with kidnapping, assault with a weapon and threatening to kill.
The incident, during which an inmate took another prisoner hostage, began on 27 August and sparked an 11-hour standoff with prison authorities.
At the time, the man was named as George Baker, 28, who is serving a life sentence for killing 17-year-old Liam Ashley in the back of a prisoner transport van in 2006.
Police say the accused is due to appear in North Shore District Court on 18 September.