How to best handle patching with diff that contains renamed files

My projects are stored on the production server X, I work locally only and my bazaar repos are stored locally too
Now, when I do some new changes and want to upload them to the production machine, I simply do bzr diff -r1..2>patch and just do patch -p0<patch on the production machine. That works in most cases

But there are at least 2 problems with this method
1. No binary file handling (I have to remember to do this myself) - I can live with that
2. When I rename and modify a file, this change is included in the patch, but is not handled by the standard patch (files are not renamed on the production machine)

What is the best way to solve issue #2? Maybe I shouldn't even use bzr diff to create patches, but some other command to upload changes between tags/revisions? (I'm thinking about bzr specific way for now).

Thanks in advance