Rfc5011 rebase