Dozens of Fringe performers are to record one-minute extracts of their Fringe shows to appear online.
The clips will appear on the BBC Comedy website, and visitors will be invited to vote for their favourite.
The competition is part of the corporation's coverage of the festival, announced today and said to be its most extensive ever.
Other highlights include the broadcast of a gig by satirical American comic Will Durst (pictured) from the Traverse Theatre on digital channel BBC4.
Kirsty Walk will present six editions of The Edinburgh Show on BBC2, as well as three live editions of Newsnight Review In Edinburgh.
Radio 4 shows including Dead Ringers, The News Quiz, Loose Ends and Just A Minute will all record Edinburgh editions.
Viewers in Scotland will have additional coverage, including The Live Floor Show and programmes hosted by comedians Bruce Morton, Fred MacAulay and Greg Proops.
And BBC1 will be showing the final of the New Comedy Competiton - featuring Dylan, Bob Kobe, Paul Kerensa, Gary Delaney, Nina Conti, Stefano Paolini, Ninia Benjamin and Karl Spain, on August 26.