diff --git a/ChangeLog b/ChangeLog
index f5cdaa0..d945654 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-15  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* morituri/image/toc.py:
+	  Add some debugging.
+
 2009-05-15  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* morituri/image/table.py:
@@ -7,6 +12,7 @@
 	  - use counter for FILE lines
 	  - put FILE line before TRACK if track does not have INDEX 00
 	  Take counter into account for setFile
+	  Fix off-by-one in setFile
 	* examples/readdisc.py:
 	  Add --track-template.
 	  Pass counter to setFile.
diff --git a/morituri/image/toc.py b/morituri/image/toc.py
index df7a9db..52e887b 100644
--- a/morituri/image/toc.py
+++ b/morituri/image/toc.py
@@ -106,9 +106,11 @@ class TocFile(object, log.Loggable):
                     # is a limitation of our parser approach
                     if state == 'HEADER':
                         self.table.cdtext[key] = value
+                        self.debug('Found disc CD-Text %s: %s', key, value)
                     elif state == 'TRACK':
                         if key != 'ISRC' or not currentTrack \
                             or currentTrack.isrc is not None:
+                            self.debug('Found track CD-Text %s: %s', key, value)
                             currentTrack.cdtext[key] = value
 
             # look for header elements