diff --git a/configure.ac b/configure.ac
index f7a77668..40bfe2ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,9 +16,10 @@ dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 dnl 02111-1307, USA.
 
 AC_PREREQ(2.52)
-AC_REVISION([$Id: configure.ac,v 1.54 2003/10/19 16:36:21 rocky Exp $])dnl
-AC_INIT(lib/cdio.c)
-AM_INIT_AUTOMAKE(libcdio, 0.65cvs)
+AC_REVISION([$Id: configure.ac,v 1.55 2003/10/28 16:23:49 rocky Exp $])dnl
+AC_INIT(libcdio, 0.65cvs)
+AC_CONFIG_SRCDIR(src/cd-info.c)
+AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 
 AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
diff --git a/doc/libcdio.texi b/doc/libcdio.texi
index b4dcc759..0df4fe82 100644
--- a/doc/libcdio.texi
+++ b/doc/libcdio.texi
@@ -19,7 +19,7 @@
 @ifinfo
 This file documents GNU CD input and control library
 
-Copyright (C) Herbert Valerio Riedel @email{<hvr@@gnu.org>} and Rocky
+Copyright (C) 2003 Herbert Valerio Riedel @email{<hvr@@gnu.org>} and Rocky
 Bernstein @email{<rocky@@panix.com>}
 
 Permission is granted to copy, distribute and/or modify this document
@@ -37,7 +37,7 @@ development.''
 
 @titlepage
 @title GNU libcdio library
-@subtitle $Id: libcdio.texi,v 1.5 2003/08/03 20:31:46 rocky Exp $
+@subtitle $Id: libcdio.texi,v 1.6 2003/10/28 16:23:49 rocky Exp $
 @author Rocky Bernstein et al.
 @page
 
@@ -490,19 +490,4 @@ drivers?.}
 @unnumbered General Index
 @printindex cp
 
-@tex
-% I think something like @colophon should be in texinfo.  In the
-% meantime:
-\long\def\colophon{\hbox to0pt{}\vfill
-\centerline{The body of this manual is set in}
-\centerline{\fontname\tenrm,}
-\centerline{with headings in {\bf\fontname\tenbf}}
-\centerline{and examples in {\tt\fontname\tentt}.}
-\centerline{{\it\fontname\tenit\/},}
-\centerline{{\bf\fontname\tenbf}, and}
-\centerline{{\sl\fontname\tensl\/}}
-\centerline{are used for emphasis.}\vfill}
-\page\colophon
-% Blame: doc@cygnus.com, 1991.
-@end tex
 @bye
diff --git a/include/cdio/iso9660.h b/include/cdio/iso9660.h
index 981d2dc6..f64fee2d 100644
--- a/include/cdio/iso9660.h
+++ b/include/cdio/iso9660.h
@@ -1,5 +1,5 @@
 /*
-    $Id: iso9660.h,v 1.25 2003/09/21 01:26:31 rocky Exp $
+    $Id: iso9660.h,v 1.26 2003/10/28 16:23:50 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
@@ -76,8 +76,8 @@
 #define ISO_VD_SUPPLEMENTARY	   2  /* Used by Joliet */
 #define ISO_VD_END	         255
 
-#define ISO_PVD_SECTOR  16
-#define ISO_EVD_SECTOR  17
+#define ISO_PVD_SECTOR  16      /* Sector of Primary Volume Descriptor */
+#define ISO_EVD_SECTOR  17      /* Sector of End Volume Descriptor */
 
 #define ISO_STANDARD_ID      "CD001"
 #define ISO_BLOCKSIZE           2048
diff --git a/src/util.c b/src/util.c
index 77bdba8b..84c457ad 100644
--- a/src/util.c
+++ b/src/util.c
@@ -1,5 +1,5 @@
 /*
-  $Id: util.c,v 1.1 2003/09/21 04:21:39 rocky Exp $
+  $Id: util.c,v 1.2 2003/10/28 16:23:50 rocky Exp $
 
   Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
   
@@ -42,7 +42,7 @@ print_version (const char *program_name, const char *version,
   driver_id_t driver_id;
 
   if (no_header == 0)
-    printf( _("%s %s (c) 2003 R. Bernstein\n"),
+    printf( "%s version %s\nCopyright (c) 2003 R. Bernstein\n",
 	    program_name, version);
   printf( _("This is free software; see the source for copying conditions.\n\
 There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\