diff --git a/doc/Makefile.am b/doc/Makefile.am
index 38f0e729..e725754a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,16 +20,16 @@ reference:
 	-( cd ${top_srcdir} && $(MAKE) doxygen )
 
 #: Create documentation in PDF format
-pdf: libcdio.pdf 
+pdf: libcdio.pdf cd-text.pdf
 
 #: Create documentation as a text file
 txt: libcdio.txt
 
 #: Create documentation in PostScript format
-ps: libcdio.ps
+ps: libcdio.ps cd-text.ps
 
 #: Create documentation in HTML format
-html: libcdio.html
+html: libcdio.html cd-text.html
 
 %.ps.gz: %.ps
 	gzip -9c $< > $@
@@ -46,4 +46,6 @@ html: libcdio.html
 # Create documentation in all formats, e.g. PDF, DVI, plain text and HTML
 all-formats: pdf dvi txt ps html
 
-MOSTLYCLEANFILES = libcdio.html libcdio.pdf libcdio.ps.gz
+MOSTLYCLEANFILES = \
+	libcdio.html libcdio.pdf libcdio.ps.gz \
+	cd-text.html cd-text.pdf cd-text.ps.gz
diff --git a/doc/libcdio.texi b/doc/libcdio.texi
index cdda0a1c..b9ff7912 100755
--- a/doc/libcdio.texi
+++ b/doc/libcdio.texi
@@ -401,13 +401,11 @@ normal operation of any CD players or CDROM drives. There are two
 different parts of the CD where the data can be stored.
 
 The first place the information can be recorded is in the R-W sub
-codes in the lead in area of the CD giving a data capacity of about
-5,000 ASCII characters (or 2,500 Kanji or Unicode characters).  This
-information is stored as a single block of data and is the format used
-in virtually all of the CD Text CDs shipping today. The method for
-reading this data from a CDROM drive is covered under the Sony
-proposal to the MMC specification. The format of the data is partially
-covered in the MMC specification.
+codes in the lead in area of the CD.  This information is stored as a
+single block of data and is the format. The method for reading this
+data from a CDROM drive is covered under the Sony proposal to the MMC
+specification. The format of the data is partially covered in the MMC
+specification.
 
 The second place the information can be recorded is in the R-W sub
 codes in the program area of the CD giving a data capacity of roughly
@@ -430,6 +428,9 @@ Not all drives support reading the RW subcodes from the program
 area. However for those that do, @value{libcdio} provides a way to get
 at this information via @code{cdtext_get()} and its friends.
 
+There is a separate document in this distribution describing CD-Text
+information and how it is encoded.
+
 @node CDDB
 @subsection Internet CD Database (CDDB)
 @cindex CDDB