Shouldn't we be using http://tools.ietf.org/html/rfc5849 ?