According to wRaR I was doing everything wrong.

o Delete all patches.
o Using options file to ignore generated files.
o Add new patch for changes detected in upstream source.

PS: (not added to changelog yet)