diff --git a/test/Makefile.am b/test/Makefile.am
index 86498c89..f975b736 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.26 2004/07/10 01:18:02 rocky Exp $
+#   $Id: Makefile.am,v 1.27 2004/07/11 02:33:18 rocky Exp $
 #
 #    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 #
@@ -50,7 +50,7 @@ check_DATA = vcd_demo.right \
              check_opts6.right check_opts7.right \
 	     isofs-m1-read.right cdda-read.right \
 	     t1.toc t2.toc t3.toc t4.toc t5.toc t6.toc t7.toc t8.toc t9.toc \
-	     data1.toc data2.toc data5.toc data6.toc data7.toc \
+	     data1.toc data2.toc data5.toc data6.toc data7.toc cdtext.toc \
 	     bad-mode1.cue bad-msf-1.cue bad-msf-2.cue bad-msf-3.cue \
 	     bad-mode1.toc bad-msf-1.toc bad-msf-2.toc bad-msf-3.toc \
 	     bad-cat1.cue bad-cat2.cue bad-cat3.cue \
diff --git a/test/cdtext.toc b/test/cdtext.toc
new file mode 100644
index 00000000..93c8000b
--- /dev/null
+++ b/test/cdtext.toc
@@ -0,0 +1,48 @@
+CD_DA
+
+// global CD-TEXT data
+
+CD_TEXT {
+
+  // Mapping from language number (0..7) used in 'LANGUAGE' statements 
+  // to language code.
+///  LANGUAGE_MAP {
+///    0 : EN  // 9 is the code for ENGLISH,
+///            // I don't know any other language code, yet
+///  }
+
+  // Language number should always start with 0
+  LANGUAGE 0 {
+    // Required fields - at least all CD-TEXT CDs I've seen so far have them.
+    TITLE "CD Title"
+    PERFORMER "Performer"
+    DISC_ID "XY12345"
+    UPC_EAN "" // usually empty
+
+    // Further possible items, all of them are optional
+    ARRANGER ""
+    SONGWRITER ""
+    MESSAGE "" 
+    GENRE "" // I'm not sure if this should be really ascii data
+  }
+}
+
+
+TRACK AUDIO
+// track specific CD-TEXT data
+CD_TEXT {
+  LANGUAGE 0 {
+    // if an item is defined for one track it should be defined for all tracks
+    TITLE "Track Title"
+
+    PERFORMER "Performer"
+    ISRC "US-XX1-98-01234"
+
+    ARRANGER ""
+    SONGWRITER ""
+    MESSAGE "" 
+  }
+}
+
+SILENCE 1:0:0
+
diff --git a/test/testtoc.c b/test/testtoc.c
index b500e46d..708d5f7d 100644
--- a/test/testtoc.c
+++ b/test/testtoc.c
@@ -1,5 +1,5 @@
 /*
-  $Id: testtoc.c,v 1.3 2004/07/10 01:18:02 rocky Exp $
+  $Id: testtoc.c,v 1.4 2004/07/11 02:33:18 rocky Exp $
 
   Copyright (C) 2004 Rocky Bernstein <rocky@panix.com>
   
@@ -38,13 +38,14 @@
 #endif
 #include <string.h>
 
-#define NUM_GOOD_TOCS 14
+#define NUM_GOOD_TOCS 15
 #define NUM_BAD_TOCS 7
 int
 main(int argc, const char *argv[])
 {
   const char *toc_file[NUM_GOOD_TOCS] = {
-    "t9.toc", 
+    "cdtext.toc", 
+    "t1.toc", 
     "t2.toc", 
     "t3.toc", 
     "t4.toc", 
@@ -57,7 +58,7 @@ main(int argc, const char *argv[])
     "data2.toc",
     "data5.toc",
     "data6.toc",
-    "data7.toc"
+    "data7.toc",
   };
 
   const char *badtoc_file[NUM_BAD_TOCS] = {