Refractor support to RFC 3263

Signed-off-by: Nicolas <nicolas@cipango.org>