Cherry-picked from upstream (inetutils-1_9_4-31-g73e2811). Could be a long time before a new inetutils release is made. vcunat amended the patch to apply.
