OnePlus today provided a timeframe as to when it will be updating its flagship killer devices to Android 6.0 Marshmallow. The young company plans on updating both the OnePlus One and OnePlus 2 to the latest version of Android by the first quarter of 2016.

The Marshmallow update for the OxygenOS running OnePlus 2 will make use of the native fingerprint scanner APIs introduced in Android 6.0 by Google. This will allow the touch-based fingerprint scanner integrated into the home button of the 2016 flagship killer to be used for verification purposes in apps like LastPass and Android Pay, which is currently not possible.

The Cyanogen OS running OnePlus One will also receive its Marshmallow update within the first 3 months of 2016. However, OnePlus does not mention any new features or enhancements that it will be introducing with the update. The company also noted that it will only be updating the community build of OxygenOS for the handset only when time and resources allow for it.

For the recently unveiled OnePlus X, the company has not mentioned any timeframe, but considering the fact that the OnePlus X has similar internals as the OnePlus One, it is likely that the handset will receive the update towards the end of Q1, 2016 or in early Q2.

OnePlus has previously missed the software update timeline of their devices before, so do take their ETA here with a huge grain of salt, even though Q1, 2016 is a pretty broad timeframe. Since the company’s devices are very developer friendly, you always have the option of flashing a community build Marshmallow based ROM on your flagship killer though.