Rolling while sleeping.....

Rolling....thats the new thing for my 4 month old son. Which is awesome. I'm very proud, however he's rolling over whenever he is sleeping which wakes him up and he hasn't figured out how to roll from tummy to back so he just crys until I turn him back over. Problem is within seconds of turning him over he rolls right back and by that time the only thing that calms him is I feed him till he's drosy/asleep then back in the crib. He'll last about 30min and rolls right back and we're at square one. It goes on ALL night long! My poor baby has to be so tired I know I am. Any mom's deal with this before? Any tips? I'll take any advice!