diff --git a/ChangeLog b/ChangeLog
index 1ff33c5..0b44e8b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-04-14  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	patch by: Peter Oliver.
+
+	* morituri/common/program.py:
+	  Handle multi-artist releases where track artist is unset.
+	  Fixes #14.
+
 2010-04-14  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/rip/image.py:
diff --git a/morituri/common/program.py b/morituri/common/program.py
index 5f44aed..4a8eec3 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -81,7 +81,7 @@ def getMetadata(release):
 
     for t in release.tracks:
         track = TrackMetadata()
-        if isSingleArtist:
+        if isSingleArtist or t.artist == None:
             track.artist = metadata.artist
             track.sortName = metadata.sortName
             track.mbidArtist = metadata.mbidArtist