Makefile.usr: pull in changes from master, adjust to release