Aldershot have signed Aaron Brown after he was released by Leyton Orient.
The central defender returns to the EBB Stadium after making 14 appearances for the Shots at the end of the 2009/10 season.
He spent half of this season on loan at Stockport, who finished bottom of League Two.
The 27-year-old counts Tamworth, Reading and Yeovil among his former clubs.
He becomes boss Dean Holdsworth's second summer signing following the announcement that Michael Rankine will be joining the club on July 1.
Holdsworth declared himself "delighted" at securing the services of the former York striker.