Apply patch from Jonathan Kew
drwxr-xr-x - src