Equilibrium reconstruction forms the core of most tokamak modelling activities. Until now the general practice has been for various tokamaks experiments to have their own unique equilibrium reconstruction codes, such as particular versions of EFIT or the CLISTE code. This paper describes EFIT-f95 and EFIT2006, two new machine-independent versions of the EFIT code.