The former Boro, Sheffield United and more recently Cardiff boss has confirmed he will be staying at the Riverside for next season.
A Middlesbrough statement said: "The club is delighted to announce that Neil Warnock has agreed a deal to remain as our manager for the 2021/22 season.
"The 72-year-old initially took over on a short-term basis last summer after Jonathan Woodgate was relieved of his duties as head coach, and he guided the club to Championship safety in the final match of his eight-game tenure.
Scarborough Athletic's home National League North campaign off to a winning start against Hereford
RETRO SPOTLIGHT: 15 nostalgic Scarborough photos from the Scarborough News sports archives
Ebberston battle back to sink hosts Filey in SBL Premier Division thriller
Scarborough Athletic slip to 2-0 defeat at Brackley Town in National League North opener
Former Harrogate Town and Bradford City goalkeeper Joe Cracknell returns to Scarborough Athletic
"The Yorkshireman committed himself for the 2020/21 season and has presided over a transformation that has seen the team challenging for the Championship play-off place.
"He has repeatedly spoken of how he is enjoying his time on Teesside and also of his desire to win a record ninth promotion. The return of fans to the Riverside is another big attraction for the veteran of over 1500 games as a manager.
"We are currently five points off the play-off places with 12 games remaining.
"Trusted lieutenants Kevin Blackwell and Ronnie Jepson will also remain at the club with the manager."