Shrews captain Darren Tinson leads his side's celebrations
Aldershot 1-1 Shrewsbury
(Shrewsbury won 3-0 on penalties)
Shrewsbury won a penalty shoot-out in a tense Conference play-off final to book the club's promotion back to the Football League at the first attempt.
Aaron McLean put Aldershot ahead when Ray Warburton headed a free-kick into his path and he powered in a shot.
Duane Darby lashed an effort into the roof of the net as Shrewsbury levelled in almost identical fashion.
Shrews keeper Scott Howie saved three penalties in the shoot-out, with Trevor Challis scoring the winning spot-kick.
Part-time Aldershot were aiming to regain the League status they lost in 1992 and started better than their full-time rivals, who were relegated from Division Three last season.
36 mins: McLean shoots Aldershot ahead
42 mins: Darby lashes Shrewsbury level
Penalties: Challis wins if for Shrewsbury
Strike partnership Roscoe D'Sane and Aaron McLean were proving a handful for Shrewsbury's defence with the former having the first real chance of the game.
D'Sane held off defender Darren Tinson and latched onto a ball over the top of the Shrews defence for a clear run on goal.
But the striker chose to shoot and dragged his effort wide.
Almost immediately, McLean pulled a low cross back for Jon Challinor who failed to connect properly with his attempted shot.
Shrewsbury had struggled out of the blocks but showed signs of getting into their stride just after the half hour mark.
Jamie Tolley produced a surging run and tried to finish it off with a shot from the edge of the area only to see his effort crucially blocked by Dominic Sterling.
Within minutes, the recalled McLean justified replacing Tim Sills by powering a close-range controlled shot into the Shrews goal.
But Darby equalised when he also lashed home a shot after a set-piece fell kindly for him.
The second-half was a tight and tense affair which should have seen Ryan Lowe put Shrewsbury in the lead after 66 minutes.
He ran into the Shots area unmarked to meet an inviting Luke Rodgers cross but put his shot comfortable high.
Tolley had a shot for Shrewsbury well saved by Nicky Bull in a nervy end to the normal 90 minutes before silver goal extra-time.
And an unmarked Lee Charles had a glorious chance but
headed into the ground and over from close range as he met Adam Miller's free-kick at the far post.
Charles spurned a less clear-cut opening in the second half of extra-time before the match went to penalties.
Shrewsbury got off to a bad start when Rodgers skied the opening spot-kick but was rescued by Howie saving from Sills to even matters up.
Howie then saved from Chris Giles and Jamie Gosling as Tolley, Jake Sedgemore and Challis scored to secure Shrewsbury's promotion.
Aldershot: Bull, Downer (Hooper 66), Sterling, Giles,
Warburton, Gosling, Miller, Challinor, Antwi,
D'Sane (Charles 86), McLean (Sills 60).
Subs not used: Barnard, Chewins.
Shrewsbury: Howie, Sedgemore, Challis,
Tinson (Lawrence 91), Ridler, Lowe, Aiston,
O'Connor (Street 84), Tolley, Darby (Cramb 93),
Subs not used: Edwards, Hart.
Booked: Lowe, O'Connor, Ridler.
Referee: K Stroud (Bournemouth).