diff --git a/include/cdio/iso9660.h b/include/cdio/iso9660.h
index de9b9422..2bfea64b 100644
--- a/include/cdio/iso9660.h
+++ b/include/cdio/iso9660.h
@@ -1,5 +1,5 @@
 /*
-    $Id: iso9660.h,v 1.88 2006/03/07 00:06:19 rocky Exp $
+    $Id: iso9660.h,v 1.89 2006/03/14 11:40:05 rocky Exp $
 
     Copyright (C) 2000 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein <rocky@panix.com>
@@ -21,7 +21,8 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA.
 */
 /*!
  * \file iso9660.h 
@@ -827,6 +828,8 @@ iso9660_stat_t *iso9660_fs_stat (CdIo_t *p_cdio, const char psz_path[]);
   Return file status for path name psz_path. NULL is returned on error.
   pathname version numbers in the ISO 9660 name are dropped, i.e. ;1
   is removed and if level 1 ISO-9660 names are lowercased.
+
+  b_mode2 is historical. It is not used.
  */
 iso9660_stat_t *iso9660_fs_stat_translate (CdIo_t *p_cdio, 
                                            const char psz_path[], 
@@ -848,6 +851,8 @@ iso9660_stat_t *iso9660_ifs_stat_translate (iso9660_t *p_iso,
 /*!  Read psz_path (a directory) and return a list of iso9660_stat_t
   pointers for the files inside that directory. The caller must free the
   returned result.
+
+  b_mode2 is historical. It is not used.
 */
 CdioList_t * iso9660_fs_readdir (CdIo_t *p_cdio, const char psz_path[], 
                                  bool b_mode2);
diff --git a/lib/iso9660/iso9660_fs.c b/lib/iso9660/iso9660_fs.c
index cd6038df..77c20426 100644
--- a/lib/iso9660/iso9660_fs.c
+++ b/lib/iso9660/iso9660_fs.c
@@ -1,8 +1,8 @@
 /*
-    $Id: iso9660_fs.c,v 1.33 2006/03/06 21:54:56 rocky Exp $
+    $Id: iso9660_fs.c,v 1.34 2006/03/14 11:40:05 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
-    Copyright (C) 2003, 2004, 2005 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 2003, 2004, 2005, 2006 Rocky Bernstein <rocky@panix.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA.
 */
 /* iso9660 filesystem-based routines */
 
@@ -52,7 +53,7 @@
 
 #include <stdio.h>
 
-static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.33 2006/03/06 21:54:56 rocky Exp $";
+static const char _rcsid[] = "$Id: iso9660_fs.c,v 1.34 2006/03/14 11:40:05 rocky Exp $";
 
 /* Implementation of iso9660_t type */
 struct _iso9660_s {
@@ -718,7 +719,7 @@ iso9660_fs_read_superblock (CdIo_t *p_cdio,
       cdio_read_data_sectors ( p_cdio, buf, ISO_PVD_SECTOR+1, ISO_BLOCKSIZE,
 			       1 );
 
-  if (DRIVER_OP_SUCCESS == driver_return) {
+    if (DRIVER_OP_SUCCESS == driver_return) {
       /* The size of a PVD or SVD is smaller than a sector. So we
 	 allocated a bigger block above (buf) and now we'll copy just
 	 the part we need to save.
@@ -1294,6 +1295,8 @@ iso9660_ifs_stat_translate (iso9660_t *p_iso, const char psz_path[])
 /*! 
   Read psz_path (a directory) and return a list of iso9660_stat_t
   of the files inside that. The caller must free the returned result.
+
+  b_mode2 is historical. It is not used.
 */
 CdioList_t * 
 iso9660_fs_readdir (CdIo_t *p_cdio, const char psz_path[], bool b_mode2)
diff --git a/src/cdda-player.c b/src/cdda-player.c
index 8092ba4f..2ff6f361 100644
--- a/src/cdda-player.c
+++ b/src/cdda-player.c
@@ -1,7 +1,7 @@
 /*
-    $Id: cdda-player.c,v 1.39 2006/02/02 06:24:34 rocky Exp $
+    $Id: cdda-player.c,v 1.40 2006/03/14 11:40:05 rocky Exp $
 
-    Copyright (C) 2005 Rocky Bernstein <rocky@panix.com>
+    Copyright (C) 2005, 2006 Rocky Bernstein <rocky@panix.com>
 
     Adapted from Gerd Knorr's player.c program  <kraxel@bytesex.org>
     Copyright (C) 1997, 1998 
@@ -18,7 +18,8 @@
 
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301 USA.
 */
 
 #ifdef HAVE_CONFIG_H