Owners of Apple’s iPhone 5s and 5c will soon be able to have broken displays replaced and other small repairs made to the device while they wait at Apple retail stores.

9to5Mac reports, and AllThingsD has independently confirmed, that Apple is preparing to extend to its new iPhones the same in-store repair program it rolled out for the iPhone 5 this past summer. Sources said that Apple Stores will be equipped to handle most common repairs – cracked screens, bad batteries, etc.

The initiative is expected to begin before the end of the year, and should be a relief to iPhone 5s and 5c users with damaged devices. It’s easier and cheaper to have the broken screen on your unwarrantied 5s replaced than to pay the fee for a replacement device and run through the backup and restore process.

Apple declined to comment.