Re-entering China with new passport?

Hello!

I'm a Canadian currently back home, and I'm in the process of renewing my passport while here.

I'm aware of what I need to do to get my residency permit transferred once I'm in China... But I wanted to check about entry requirements.

Am I right to think that I can just present my new passport alongside the old one containing the residency permit when I land in China? Or do I need to do something else?

EDIT:

For anyone searching the web for this topic: I re-entered China without any problem. It took a bit longer for my airline to validate my residency permit (had to double-check with a manager), but once they did, everything went smoothly. I presented my passport to the customs agent who didn't bat an eye.

Once I was back home, I registered with the police, then applied to transfer my permit to my new passport, which had to be done within one week. This took about one week. Once I got back my passport with my new residency permit, I had to go re-register with the police.