Maybe a final version of the hostname support.