Just bring your old passport and your news passport with you for when you exit and enter the country. The old passport with your current visa/rp will still be valid. Use the new passport in other countries. The visa / rp in your old passport will be good until your rp expires and you have to get a new one. Trust me, just did it at the airport.