July's Electric Frog Summer Festival was, at the very last minute, curtailed by a day due to some large scale engineering works at the festival site.

It was an unfortunate turn of events which might have been the catalyst for the whole thing turning out a bit of a damp squib: it was hampered by no-shows and the booze ran out mid-evening.

The chaps behind the show promised a rescheduled and revamped return though, and – all going to plan of course – they've more than made up for it. This weekend's line-up is stellar, bringing together the most credible names in dance, indie and post-rock.

Saturday alone is one of the most thrilling electronic bills in years. It features influential techno DJ and producer Jeff Mills, Detroit techno legend Derrick May and –most excitingly – Frankie Knuckles, the man who practically spawned house music.

Those three names could easily pad out a full weekend, but Sunday sees a programme of full live bands across the festival's two stages.

Glasgow's Errors will bring their winning post-electronica, The Orb will give a rare live performance of their lush ambient techno, The Fall might cause a mini riot if Mark E Smith lasts the full set, and headlining local legends Mogwai will shatter eardrums and melt hearts with their transcendent, glorious and moving post-rock. Your ears will feel spoiled.

l The Electric Frog September Weekender, SWG3, this Saturday and Sunday, 2pm-10pm, Day tickets £27.50, weekend tickets £50.

Bloc booking

We know Bloc best as host to the best alternative new music: be it thrusting speed metal, heartwarming acoustic folk or the city's latest indie darlings.

This promises to bring quite a different vibe to the low-lit Bath Street institution: it's a full-on dance party (to use an increasingly popular Americanisation) hosted by New Life, the local collective whose sterling effort at putting on excellent free gigs must be applauded. Tickling the turntables will be New Life resident Gerry Blythe, techno producer and remixer Esq, and Sub Club resident Floyd.

l Black Sheep Club, Bar Bloc, Tomorrow, 10pm-3am, Free before Midnight.

Afro dizzy act

Africa Hitech's mission is simple: to create African music from the future.

If you're imagining Ladysmith Black Mambazo in silver robes and space helmets, stop now - these are two chaps (one distinctly non-African) who, having been in the electronica business for years, recently launched debut album 93 Million Miles.

It's an album of jarring, eclectic influences that doesn't sound like 'African music from the future' but a little more like glitchy, contemporary electronica with vaguely Afro rhythms. While it lacks the warmth and the emotional connection that all great African music has, fans of dubstep and squelching synths will love it.

Support comes from Rudy Zygadlo, whose mangling of pop and dubstep is interesting to say the least, ethereal trip-hopper Anxst, and Mixed Bizness' Point to C.

l Africa Hitech, The Arches, Tomorrow, 8pm-1am, £7.