diff --git a/confluent_server/confluent/discovery/core.py b/confluent_server/confluent/discovery/core.py
index 7ca752a4..11f9b28b 100644
--- a/confluent_server/confluent/discovery/core.py
+++ b/confluent_server/confluent/discovery/core.py
@@ -947,7 +947,9 @@ def get_node_by_uuid_or_mac(uuidormac):
 
 def get_nodename_from_enclosures(cfg, info):
     nodename = None
-    cuuid = info.get('attributes', {}).get('chassis-uuid', [None])[0]
+    cuuid = info.get('enclosure.uuid', None)
+    if not cuuid:
+        cuuid = info.get('attributes', {}).get('chassis-uuid', [None])[0]
     if cuuid and cuuid in nodes_by_uuid:
         encl = nodes_by_uuid[cuuid]
         bay = info.get('enclosure.bay', None)
diff --git a/confluent_server/confluent/discovery/handlers/xcc.py b/confluent_server/confluent/discovery/handlers/xcc.py
index 537cf285..a4723e31 100644
--- a/confluent_server/confluent/discovery/handlers/xcc.py
+++ b/confluent_server/confluent/discovery/handlers/xcc.py
@@ -30,6 +30,15 @@ import struct
 getaddrinfo = eventlet.support.greendns.getaddrinfo
 
 
+def fixuuid(baduuid):
+    # SMM dumps it out in hex
+    uuidprefix = (baduuid[:8], baduuid[9:13], baduuid[14:18])
+    a = codecs.encode(struct.pack('<IHH', *[int(x, 16) for x in uuidprefix]),
+        'hex')
+    a = util.stringify(a)
+    uuid = (a[:8], a[8:12], a[12:16], baduuid[19:23], baduuid[24:])
+    return '-'.join(uuid).lower()
+
 class LockedUserException(Exception):
     pass
 
@@ -94,7 +103,7 @@ class NodeHandler(immhandler.NodeHandler):
         if attrs.get('enclosure-form-factor', None) == 'dense-computing':
             encuuid = attrs.get('chassis-uuid', None)
             if encuuid:
-                self.info['enclosure.uuid'] = encuuid
+                self.info['enclosure.uuid'] = fixuuid(encuuid)
             slot = int(attrs.get('slot', 0))
             if slot != 0:
                 self.info['enclosure.bay'] = slot