Add support to RFC 3263: fix issues

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