What is a good way to fix leaky rivets on a boat?

I have a 14 foot aluminum john boat that has been leaking from the rivets. I have tried using a type of epoxy but it cracks because the boat twists because of its length. I have tried using something more flexible but it quickly gets rubbed off from going over rocks. What would be the best thing to do to fix this problem?