The Scot, 42, joined Buxton in February 2012, steering them to 13th place in his first season, before claiming a seventh-placed finish in 2012/13.
The news was revealed prior to Saturday’s FA Trophy clash with Darlington, which ended 1-1.
A club spokesperson said: “Buxton Football Club is delighted to announce that manager Martin McIntosh has signed a new two-and-a-half-year contract for the club, to run to the end of the 2015/16 season.
“The directors, recognising the value of stability, are most appreciative of the work Martin has done in turning round the club’s fortunes in his 21 months at the Silverlands, driving Buxton Football Club forward from near-certain relegation to a challenging position in the Evo-Stik Premier Division.
“We now look forward to Martin leading the club to further progress in the seasons ahead.”