diff --git a/ChangeLog b/ChangeLog
index 739fc09..46c797b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-20  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/common/encode.py:
+	  Debug failing to write tags better.  See #60.
+
 2011-03-20  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/program/cdparanoia.py:
diff --git a/morituri/common/encode.py b/morituri/common/encode.py
index b7ac1fe..d9c3b05 100644
--- a/morituri/common/encode.py
+++ b/morituri/common/encode.py
@@ -464,7 +464,8 @@ class SafeRetagTask(task.MultiSeparateTask):
             if taskk == self.tasks[0]:
                 taglist = taskk.taglist.copy()
                 if common.tagListEquals(taglist, self._taglist):
-                    self.debug('tags are already fine')
+                    self.debug('tags are already fine: %r',
+                        common.tagListToDict(taglist))
                 else:
                     # need to retag
                     self.debug('tags need to be rewritten')
@@ -497,6 +498,8 @@ class SafeRetagTask(task.MultiSeparateTask):
                         e = TypeError("Checksums failed")
                         self.setAndRaiseException(e)
                 else:
+                    self.debug('failed to update tags, only have %r',
+                        common.tagListToDict(self.tasks[4].taglist))
                     os.unlink(self._tmppath)
                     e = TypeError("Tags not written")
                     self.setAndRaiseException(e)