If you’ve recently updated your iPhone to iOS 5 only to find the battery is conking out much earlier than expected, Apple knows, and what’s more, also has a solution coming.

In a statement made to AllThingsD this week, Apple said that it had “found a few bugs that are affecting battery life” and “will release a software update to address those in a few weeks.”

According to developers, an update to iOS 5 has just been rolled out for testing, indicating Apple has probably found the solution, and it’s just a matter of time before we see it on all affected devices.