Rename manpage and CFLAGS should not be overwritten

I applied this one (sorry I didn't import this properly from you -- still a novice with git :-( )