diff --git a/lib/_cdio_linux.c b/lib/_cdio_linux.c
index d1a751d3..47419692 100644
--- a/lib/_cdio_linux.c
+++ b/lib/_cdio_linux.c
@@ -1,5 +1,5 @@
 /*
-    $Id: _cdio_linux.c,v 1.58 2004/06/27 15:29:21 rocky Exp $
+    $Id: _cdio_linux.c,v 1.59 2004/06/27 16:36:38 rocky Exp $
 
     Copyright (C) 2001 Herbert Valerio Riedel <hvr@gnu.org>
     Copyright (C) 2002, 2003, 2004 Rocky Bernstein <rocky@panix.com>
@@ -27,7 +27,7 @@
 # include "config.h"
 #endif
 
-static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.58 2004/06/27 15:29:21 rocky Exp $";
+static const char _rcsid[] = "$Id: _cdio_linux.c,v 1.59 2004/06/27 16:36:38 rocky Exp $";
 
 #include <string.h>
 
@@ -86,7 +86,8 @@ typedef struct {
 
   /* Track information */
   struct cdrom_tochdr    tochdr;
-  struct cdrom_tocentry  tocent[100];    /* entry info for each track */
+  /* Entry info for each track, add 1 for leadout. */
+  struct cdrom_tocentry  tocent[CDIO_CD_MAX_TRACKS+1]; 
 
 } _img_private_t;
 
@@ -819,7 +820,7 @@ _get_first_track_num_linux(void *user_data)
   string when done with it.
 
  */
-static cdio_mcn_t
+static char *
 _get_mcn_linux (const void *env) {
 
   struct cdrom_mcn mcn;