While here update Makefile header and convert to OPTIONSNG. Reported by: Gustau Perez <gustau.perez@gmail.com> [1]