diff --git a/roles/collectd/fedmsg-service/templates/fedmsg-service-collectd.py b/roles/collectd/fedmsg-service/templates/fedmsg-service-collectd.py
index 067bf9da12..69b612b474 100644
--- a/roles/collectd/fedmsg-service/templates/fedmsg-service-collectd.py
+++ b/roles/collectd/fedmsg-service/templates/fedmsg-service-collectd.py
@@ -10,7 +10,8 @@ import time
 import zmq
 
 
-hostname = socket.gethostname().split('.')[0]
+#hostname = socket.gethostname().split('.')[0]
+hostname = socket.gethostname()  # Use FQDN, I guess..
 
 
 def print_consumer(service, consumer):