diff --git a/whipper/command/cd.py b/whipper/command/cd.py
index 8e8f526..4ac46a0 100644
--- a/whipper/command/cd.py
+++ b/whipper/command/cd.py
@@ -449,11 +449,14 @@ Log files will log the path to tracks relative to this directory.
                     try:
                         logger.debug('ripIfNotRipped: track %d, try %d',
                                      number, tries)
+                        tag_list = self.program.getTagList(number,
+                                                           self.mbdiscid)
+                        if self.itable.tracks[number].isrc is not None:
+                            tag_list['ISRC'] = self.itable.tracks[number].isrc
                         self.program.ripTrack(self.runner, trackResult,
                                               offset=int(self.options.offset),
                                               device=self.device,
-                                              taglist=self.program.getTagList(
-                                                  number, self.mbdiscid),
+                                              taglist=tag_list,
                                               overread=self.options.overread,
                                               what='track %d of %d%s' % (
                                                   number,
diff --git a/whipper/common/program.py b/whipper/common/program.py
index 50de26e..97edd94 100644
--- a/whipper/common/program.py
+++ b/whipper/common/program.py
@@ -466,8 +466,6 @@ class Program:
                 if len(performers) > 0:
                     tags['PERFORMER'] = performers
 
-        # TODO/FIXME: ISRC tag
-
         return tags
 
     def getHTOA(self):