The column-averaged dry-air mole fractions of carbon dioxide and methane (XCO2 and XCH4) have been retrieved from Greenhouse gases Observing SATellite (GOSAT) Short-Wavelength InfraRed (SWIR) observations and released as a SWIR L2 product from the National Institute for Environmental Studies (NIES). XCO2 and XCH4 retrieved using the version 01.xx retrieval algorithm showed large negative biases and standard deviations (−8.85 and 4.75 ppm for XCO2 and −20.4 and 18.9 ppb for XCH4, respectively) compared with data of the Total Carbon Column Observing Network (TCCON). Multiple reasons for these error characteristics (e.g., solar irradiance database, handling of aerosol scattering) are identified and corrected in a revised version of the retrieval algorithm (version 02.xx). The improved retrieval algorithm shows much smaller biases and standard deviations (−1.48 and 2.09 ppm for XCO2 and −5.9 and 12.6 ppb for XCH4, respectively) than the version 01.xx. Also, the number of post-screened measurements is increased, especially at northern mid- and high-latitudinal areas.