More makefile updates
Update user-agent regexes