diff --git a/yolk/metadata.py b/yolk/metadata.py
index 3690bae..c25472e 100644
--- a/yolk/metadata.py
+++ b/yolk/metadata.py
@@ -32,10 +32,14 @@ def get_metadata(dist):
     @returns: dict of metadata or None
 
     """
-    if not dist.has_metadata('PKG-INFO'):
+    if dist.has_metadata('PKG-INFO'):
+        metadata = dist.get_metadata('PKG-INFO')
+    elif dist.has_metadata('METADATA'):
+        metadata = dist.get_metadata('METADATA')
+    else:
         return
 
-    msg = email.message_from_string(dist.get_metadata('PKG-INFO'))
+    msg = email.message_from_string(metadata)
     metadata = {}
     for header in [l for l in msg._headers]:
         metadata[header[0]] = header[1]