Make new versioned nmap.rc.in and nsis/Nmap.nsi.in, and use those to generate unversioned nmap.rc and nsis/Nmap.nsi. The changes made to those files were constantly causing problems with updating.