Data repair enhancements for multicast/broadcast data distribution

A method, system, device, and computer code product is disclosed in which a sender (10) transmits data to a plurality of receivers (20) via a point-to-multipoint session. The receiver sends data repair requests to the sender (10) requesting data expected but not received and the sender (10) retransmits the expected but not received data via the point-­to-multipoint session. The sender (10) can also schedule point-to-point data repair sessions with individual receivers if the retransmission via the point-to-multipoint session does not correct all errors. The sender (10) can be configured to delay point-to-­point repair sessions using a randomization mechanism based on the number of receivers using the point-to-multipoint session.