The awesome new cameras packed into the Galaxy S6 and S6 edge are about to get even better, with improvements and new features on the horizon. Sources familiar with Samsung’s plans say the changes will come with its new Android 5.1.1 upgrade.

The Galaxy S6 has the best camera I’ve ever used on an Android-powered smartphone — by far. It’s the only smartphone I’ve ever used that consistently beats the images you’ll get from an iPhone in any situation, and according to a new report, it’s only going to get better.

“There’s always room for some improvement no matter how good a particular aspect of a smartphone might be, and our sources tell us that Samsung is currently working on an important update for the Galaxy S6 and S6 edge’s cameras,” the ever-reliable SamMobile reports.

The improvements could include full support for the Google camera API that was introduced with Lollipop, which gives users greater control over the camera sensors in their devices. It’s though Samsung could also enable the capturing of RAW images, and an option to control shutter speed.

These things seem like plausible improvements given that they are already offered by rival devices like the HTC One M9 and the new LG G4. But for now, neither SamMobile or their sources can confirm exactly what the upgrade will bring.

We do know it will be bundled with Samsung’s upcoming Android 5.1.1 upgrade, which is likely to rollout in the coming months. It has already appeared for handsets on T-Mobile, but it’s thought that was a pre-release build, and it was quickly pulled after making its way into the wild.

• SourceSamMobile