Support for RFC 4145/4572