Conform to rfc-site requirements