Merge modified --with-rsh patch: we now determine the default