Ferrari has confirmed that Antonio Spagnolo will be Kimi Raikkonen's race engineer in 2014.
Raikkonen will return to Ferrari in 2014 and visited the team's factory in Maranello on Tuesday.
Raikkonen was previously engineered by Chris Dyer and Andrea Stella; the latter now works as Fernando Alonso's race engineer.
Spagnolo has worked as a chassis engineer on Alonso's car but will be promoted to work alongside Raikkonen as his race engineer.
'Today in Maranello, Raikkonen was on hand to meet [team principal] Stefano Domenicali and the senior engineers from the Scuderia,' Ferrari posted on their website.
'It was an opportunity to go over the current state of play on the design of the 2014 car, as well as a chance for Kimi to meet up with many old friends who, in a few weeks time will once again be his team.'
'These include Antonio Spagnolo, who next season will the Finnish driver’s race engineer.'
Raikkonen raced for Ferrari between 2007 and 2009, claiming the world title in his first year with the team.
Ferrari's announcement paves the way for Massa's former race engineer, Rob Smedley, to join the Brazilian at Williams.