diff --git a/picard/mbxml.py b/picard/mbxml.py
index e0873ba00..e6c0541d5 100644
--- a/picard/mbxml.py
+++ b/picard/mbxml.py
@@ -140,6 +140,7 @@ def label_info_from_node(node):
             catalog_numbers.append(label_info.catalog_number[0].text)
     return (labels, catalog_numbers)
 
+
 def track_to_metadata(node, track, config=None):
     m = track.metadata
     recording_to_metadata(node.recording[0], track, config)
@@ -170,6 +171,8 @@ def recording_to_metadata(node, track, config=None):
             m['title'] = nodes[0].text
         elif name == 'length' and nodes[0].text:
             m.length = int(nodes[0].text)
+        elif name == 'disambiguation':
+            m['~recordingcomment'] = nodes[0].text
         elif name == 'artist_credit':
             artist_credit_to_metadata(nodes[0], m, config=config)
         if name == 'relation_list':
@@ -203,6 +206,8 @@ def release_to_metadata(node, m, config=None, album=None):
             m['releasestatus'] = nodes[0].text.lower()
         elif name == 'title' and not standardize_title:
             m['album'] = nodes[0].text
+        elif name == 'disambiguation':
+            m['~releasecomment'] = nodes[0].text
         elif name == 'asin':
             m['asin'] = nodes[0].text
         elif name == 'artist_credit':