Croft back with Oldham
The 29-year-old winger has signed a pre-contract agreement with Latics and will officially join on July 1.
Croft has previously had two spells on loan at Boundary Park, making a total of 65 appearances, and was named player of the year in his second stint during the 2012/13 season.
The former Manchester City trainee has agreed a one-year deal with the option of a second.
Croft arrives as a free agent having been released by St Johnstone, where he made 34 appearances last season.