Updated patch. Ok to push to wip-hurd?