By matching infrared-selected, massive young stellar objects (MYSOs) and compact HII regions in the Red MSX Source survey to massive clumps found in the submillimetre ATLASGAL (APEX Telescope Large Area Survey of the Galaxy) survey, we have identified ~1000 embedded young massive stars between 280{deg}<l<350{deg} and 10{deg}<l<60{deg} with |b|<1.5{deg}. Combined with an existing sample of radio-selected methanol masers and compact HII regions, the result is a catalogue of ~1700 massive stars embedded within ~1300 clumps located across the inner Galaxy, containing three observationally distinct subsamples, methanol-maser, MYSO and HII-region associations, covering the most important tracers of massive star formation, thought to represent key stages of evolution.