Abu Dawud mentioned both of these. Al-Waqidi also mentioned it from his teachers, just as Makhul mentioned it, and he claimed that the one who advised it was Salman al-Farisi (may Allah be pleased with him).
Hadith Referenceالسنن الكبرى للبيهقي / كتاب السير / 18121