Sayyiduna Abu Sa'id al-Khudri (may Allah be pleased with him) narrates from the Prophet (peace and blessings be upon him) regarding making up witr; this will come later.
The narration of Yahya bin Abi Kathir appears to be the more sound.
Hadith Referenceالسنن الكبرى للبيهقي / كتاب الصلاة / 4514