Giant-killers Northwich Victoria have been handed an FA Cup second round clash with Lincoln City after causing the shock of the first round on Sunday.
The Blue Square North side beat League One high-flyers Charlton Athletic 1-0 thanks to Wayne Riley's 81st-minute strike and now entertain the Red Imps at the Marston Arena later this month.
Kettering Town, who beat Hartlepool United, face Leeds United at their Rockingham Road ground while Staines Town, who shocked Shrewsbury Town on Saturday, will host Millwall or AFC Wimbledon, who meet on Monday evening.
After winning at Grimsby Town, Bath City have also been rewarded with a home tie against Forest Green Rovers or Mansfield Town while York City, conquerors of Crewe Alexandra, have an all-Blue Square Premier League encounter at Cambridge United to plan for.
Full second round draw:
Northwich Victoria v Lincoln City
Northampton Town v Southampton
Hereford United v Colchester United
Tranmere Rovers/Leyton Orient v Aldershot Town
Kettering Town v Leeds United
Gillingham v Burton Albion
Wrexham v Swindon Town
Wycombe Wanderers/Brighton & Hove Albion v Rushden & Diamonds
Rotherham United v Luton Town/Rochdale
Milton Keynes Dons v Exeter City
Gateshead/Brentford v Walsall
Carlisle United/Morecambe v Norwich City
Accrington Stanley v Barnet
Oxford United v Barrow
Bournemouth v Notts County
Stockport County v Torquay United
Cambridge United v York City
Bath City v Forest Green Rovers/Mansfield Town
Port Vale/Stevenage Borough v Huddersfield Town
Staines Town v Millwall/AFC Wimbledon.