The Goddard Fabry-Perot/Integral Field Spectrograph at Apache Point Observatory is being upgraded to include an integral field spectroscopy mode and a new EMCCD detector. The upgrade will allow investigation of fainter emission line objects. The IFS will have a larger field of view than similar instruments and will use a pinhole mask to provide high contrast imaging. Final commissioning is planned for late 2010 or early 2011.