diff --git a/doc/libcdio.texi b/doc/libcdio.texi
index ee5202b3..11aaf215 100644
--- a/doc/libcdio.texi
+++ b/doc/libcdio.texi
@@ -2,7 +2,7 @@
 @c %**start of header
 @setfilename libcdio.info
 @include version.texi
-@settitle GNU @code{libcdio}: Compact Disc Input and Control Library
+@settitle GNU @code{libcdio}: Compact Disc Input, Output, and Control Library
 @c %**end of header
 
 @c Karl Berry informs me that this will add straight quotes in 
@@ -12,7 +12,7 @@
 @set txicodequotebacktick
 
 @copying
-This manual documents @code{libcdio}, the GNU CD Input and Control
+This manual documents @code{libcdio}, the GNU CD Input, Output and Control
 Library.
 
 Copyright @copyright{} 2003, 2004, 2005, 2006, 2007, 2008, 2010 Rocky
@@ -42,12 +42,12 @@ Texts.  A copy of the license is included in the section entitled
 
 @dircategory Software libraries
 @direntry
-* libcdio: (libcdio).           GNU Compact Disc Input and Control Library.
+* libcdio: (libcdio).           GNU Compact Disc Input, Output, and Control Library.
 @end direntry
 
 @titlepage
 @title GNU @code{libcdio}
-@subtitle GNU Compact Disc Input and Control Library
+@subtitle GNU Compact Disc Input, Output and Control Library
 @subtitle for version @value{VERSION}, @value{UPDATED}
 @author Rocky Bernstein et al. (@email{bug-libcdio@@gnu.org})
 @page
@@ -280,8 +280,8 @@ displays ISO-9660 information from an ISO-9660 image. Below is some
 sample output
 
 @smallexample
-iso-info version 0.72
-Copyright (c) 2003, 2004, 2005 R. Bernstein
+iso-info version 0.82 x86_64-unknown-linux-gnu
+Copyright (c) 2003, 2004, 2005, 2007, 2008 R. Bernstein
 This is free software; see the source for copying conditions.
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
 PARTICULAR PURPOSE.
@@ -292,7 +292,7 @@ Preparer   : K3b - Version 0.11.12
 Publisher  : Rocky Bernstein
 System     : LINUX           
 Volume     : K3b data project
-Volume Set : K3b data project
+Volume Set :
 __________________________________
 ISO-9660 Information
 /:
@@ -2284,6 +2284,16 @@ that the back-end CD-reading code has been replaced by
 
 Regression tests
 
+@item @code{test/data}
+
+Disk images and image meta-data used in tests
+
+
+@item @code{test/driver}
+
+Unit tests centered around the libcdio library (@code{libcdio}, source
+location @code{lib/driver}
+
 @end itemize
 
 @subsection @samp{libcdio}