diff --git a/ChangeLog b/ChangeLog
index 941ec8fd..6795e3bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,58 @@
+2003-08-01 23:47  rocky
+
+	* Makefile.am: Remove that directory in EXTRA_DIST!
+
+2003-08-01 23:43  rocky
+
+	* example/: README, sample1.c: Add a sample program. More will
+	follow later...
+
+2003-08-01 23:41  rocky
+
+	* doc/libcdio.texi: typo.
+
+2003-07-29 22:05  rocky
+
+	* doc/libcdio.texi: More verbiage. Alas not on how to use *this*
+	package, but we are getting there if by virtue of not being able to
+	postpone it too much more.
+
+2003-07-28 06:46  rocky
+
+	* doc/libcdio.texi: Small additions and edits.
+
+2003-07-28 06:31  rocky
+
+	* doc/.cvsignore: [no log message]
+
+2003-07-27 22:25  rocky
+
+	* Makefile.am, configure.ac, doc/Makefile.am, doc/libcdio.texi:
+	First feeble attempt at documentation.
+
+2003-07-27 18:52  rocky
+
+	* include/cdio/cdio.h, lib/_cdio_bincue.c, lib/_cdio_linux.c,
+	lib/_cdio_nrg.c, lib/_cdio_sunos.c: Small comment change.
+
+2003-07-11 20:26  rocky
+
+	* parse/: Makefile, test/runall: Add simple regression testing
+	driver.
+
+2003-06-22 18:41  rocky
+
+	* ChangeLog, include/cdio/cdio.h, lib/cdio.c, lib/cdio_private.h,
+	src/cd-info.c: MIN_DRIVER, MIN_DEVICE_DRIVER, MAX_DEVICE_DRIVER ->
+	CDIO_...  Add CDIO_MAX_DRIVER (distinct from CDIO_MAX_DEVICE_DRIVER
+	
+	cdio.c (cdio_open): was only scanning devices. Change to scan disk
+	image files as well.
+
+2003-06-15 21:21  rocky
+
+	* NEWS: [no log message]
+
 2003-06-13 00:47  rocky
 
 	* configure.ac: Order of libraries is important in cygwin (and
diff --git a/Makefile.am b/Makefile.am
index a0c1c12e..79e78001 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.10 2003/08/02 03:47:24 rocky Exp $
+#   $Id: Makefile.am,v 1.11 2003/08/09 11:52:00 rocky Exp $
 #
 #    Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
 #
@@ -21,7 +21,7 @@
 ##     which make can then use to produce stuff. Isn't configuration simple? 
 
 EXTRA_DIST = libpopt.m4 THANKS libcdio.spec.in \
-	     example/README example/sample1.c
+	     example/README example/sample1.c example/sample2.c
 
 SUBDIRS =  doc include lib src test
 
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7c85d6f4..3a29696e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,12 @@
-libcdio_TEXINFOS = libcdio.texi 
+info_TEXINFOS = libcdio.texi 
+
+pdf: libcdio.pdf 
+
+txt: libcdio.txt
+
+ps: libcdio.ps
+
+html: libcdio.html
 
 %.ps.gz: %.ps
 	gzip -9c $< > $@
@@ -12,6 +20,6 @@ libcdio_TEXINFOS = libcdio.texi
 .texi.txt:
 	makeinfo --no-headers $< > $@
 
-all-formats: libcdio.pdf libcdio.dvi libcdio.txt libcdio.ps libcdio.html
+all-formats: pdf dvi txt ps html
 
 MOSTLYCLEANFILES = libcdio.html libcdio.pdf libcdio.ps.gz
diff --git a/example/sample1.c b/example/sample1.c
index 28d76a78..f1c0e691 100644
--- a/example/sample1.c
+++ b/example/sample1.c
@@ -1,5 +1,5 @@
 /*
-  $Id: sample1.c,v 1.1 2003/08/02 03:43:19 rocky Exp $
+  $Id: sample1.c,v 1.2 2003/08/09 11:52:00 rocky Exp $
 
   Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
   
@@ -20,6 +20,7 @@
 
 /* Simple program to list track numbers and logical sector numbers of
    a Compact Disc using libcdio. */
+#include <stdio.h>
 #include <sys/types.h>
 #include <cdio/cdio.h>
 int
@@ -28,20 +29,19 @@ main(int argc, const char *argv[])
   CdIo *cdio = cdio_open ("/dev/cdrom", DRIVER_UNKNOWN);
   track_t first_track_num = cdio_get_first_track_num(cdio);
   track_t num_tracks      = cdio_get_num_tracks(cdio);
-  int i;
+  int j, i=first_track_num;
 
   printf("CD-ROM Track List (%i - %i)\n", first_track_num, num_tracks);
 
   printf("  #:  LSN\n");
   
-  for (i = first_track_num; i <= CDIO_CDROM_LEADOUT_TRACK; i++) {
+  for (j = 0; j < num_tracks; i++, j++) {
     lsn_t lsn = cdio_get_track_lsn(cdio, i);
-    if (CDIO_INVALID_LSN != lsn) {
-      if (i == CDIO_CDROM_LEADOUT_TRACK) {
-	printf("%3d: %06d  leadout\n", (int) i, lsn);
-      } else 
+    if (CDIO_INVALID_LSN != lsn)
 	printf("%3d: %06d\n", (int) i, lsn);
-    }
   }
+  printf("%3X: %06d  leadout\n", CDIO_CDROM_LEADOUT_TRACK, 
+	 cdio_get_track_lsn(cdio, CDIO_CDROM_LEADOUT_TRACK));
+  cdio_destroy(cdio);
+  return 0;
 }
-
diff --git a/example/sample2.c b/example/sample2.c
index fed7b6b0..56fff53f 100644
--- a/example/sample2.c
+++ b/example/sample2.c
@@ -1,5 +1,5 @@
 /*
-  $Id: sample2.c,v 1.1 2003/08/03 20:02:04 rocky Exp $
+  $Id: sample2.c,v 1.2 2003/08/09 11:52:00 rocky Exp $
 
   Copyright (C) 2003 Rocky Bernstein <rocky@panix.com>
   
@@ -45,5 +45,3 @@ main(int argc, const char *argv[])
       printf("We don't have: %s\n", cdio_driver_describe(driver_id));
   return 0;
 }
-
-