Dear Guix,

Please see attached diff for Rserve.

Best regards,
Eric