Apple Unveils iPhone 6
Apple CEO Tim Cook shows off the new iPhone 6 and the Apple Watch during an Apple special event at the Flint Center for the Performing Arts on September 9, 2014 in Cupertino, California.  Justin Sullivan—Getty Images

The Worst Thing About the iPhone Is About to Be Fixed

Your iPhone is about to get way more useful for navigating around big cities.

Apple's upcoming iOS 9 update will add public transportation data to the default Maps app, according to 9to5Mac. The company will reportedly unveil bus, subway and train directions within the app at the Worldwide Developers Conference in June.

This is the first time Apple's Maps app will include public transit data since the company stopped using Google's mapping data in 2012. Apple was reportedly planning on including the new features in iOS 8, but pulled them at the last minute because of personnel and data issues.

Sources also told 9to5Mac that Apple is making progress with an indoor mapping project to help users find their way inside large buildings and landmarks. However, it's unclear when that will be released.

PHOTOS: The Rise of Mobile Phones from 1916 to Today

A German field telephone station in the Aisne department of northern France during World War I.
1916 A German field telephone station in the Aisne department of northern France during World War I.Paul Thompson—FPG/Getty Images
A German field telephone station in the Aisne department of northern France during World War I.
French singer and actor Johnny Hallyday in a scene from the film 'Point de Chute' (aka 'Falling Point').
An early mobile phone during the Iranian Embassy siege at Princes Gate in South Kensington, London.
Bob Maxwell, general manager of Englewood-based Mobile Telephone of Colorado, places a call on FCC-approved radio frequency while driving to work.
THE A-TEAM -- "The Say U.N.C.L.E. Affair" Episode 5. (l-r) Eddie Velez as Frankie Santana, Robert Vaughn as General Hunt Stockwell, George Peppard as John 'Hannibal' Smith.
Bill Clinton,  Ray Flynn
Whoopi Goldberg during ShoWest in Las Vegas.
A farmer with his family sitting on a Bullock Cart and talking on a mobile Phone, in Delhi.
World Trade Center Terrorist Attack.
A rebel militiaman speaks on his mobile phone after capturing territory from government troops on March 25 2 in Ben Jawat, Libya.
A youth films the aftermath of tear gas police fired at protestors in Muhammed Mahmoud Street near Tahrir Square on November 23 in Cairo.
Audience members take pictures of President Barack Obama at Florida Atlantic University on April 10 in Boca Raton, Florida.
A teenager takes a selfie in front of Queen Elizabeth II during a walk around St. Georges Market in Belfast.
1916 A German field telephone station in the Aisne department of northern France during World War I.
Paul Thompson—FPG/Getty Images
1 of 13
TIME may receive compensation for some links to products and services on this website. Offers may be subject to change without notice.