Updated for RFC 369