Implement RFC 2324