Make more links https
merge of '507b3e6cace11c83363cfa3d9b9698930740311b'
     and '5634ca1b4973ae922d693de7edd0f3f966ad72d5'
Use env to work around Arch silliness