RFC 5090 support