Bad whitespace but matches upstream
Remove ifdef distro, pwd lock is now part of upstream
Reshuffle and update with upstream
Whitespace according to upstream