I don't think its a good idea to automatically attach the hostname as a suffix.  People may not realize this is being exposed if they haven't configured anything explicit.  You're leaking information that you may not want to leak.