The fluorescence excitation spectrum of naphthalene seeded in a supersonic free jet and the single vibronic level fluorescence spectrum of room temperature naphthalene vapor have been used to determine assignments for a number of combination and sequence transitions that were previously unassigned. Our data, when combined with data in the literature, require some changes in previous assignments. The spectroscopic literature on naphthalene and naphthalene-d8 is reviewed and up-to-date tables of vibrational frequencies are presented.