diff --git a/README b/README
index 7540477a..c6bfa11b 100644
--- a/README
+++ b/README
@@ -14,7 +14,7 @@ navigation-capable Video CD plugin and CD-DA plugins for the media
 players xine (http://xinehq.de) and videolan's vlc
 (http://videolan.org).
 
-Also include in the libcdio package is a utility program cd-info which
+Also included in the libcdio package is a utility program cd-info which
 displays CD information: number of tracks, CD-format and if possible
 basic information about the format.  If libcddb
 (http://libcdddb.sourceforge.net) is available, the cd-info program
@@ -27,4 +27,16 @@ performing low-level block reading of a CD or CD image, iso-info for
 displaying ISO-9660 information from an ISO-9660 image, and iso-read
 for extracting files from an ISO-9660 image.
 
-$Id: README,v 1.3 2004/02/25 09:56:37 rocky Exp $
\ No newline at end of file
+At present, there is no support for directing CD Audio control,
+e.g. playing, stopping, or pausing of a CD-CA where the blocks are not
+actually read into the computer. Nor is there any support for writing
+CD's. Nor is there any support for reading or writing DVDs. For some
+of these, there are other libraries (e.g. libdi, libscg, or libdvdread)
+may be helpful.
+
+I'm not theoretically opposed to putting support like this into
+libcdio. However at present there are already many gaps in this
+library so narrowing its scope in order to focus on these things I
+think is a good idea.
+
+$Id: README,v 1.4 2004/02/27 02:35:24 rocky Exp $
diff --git a/configure.ac b/configure.ac
index 386e234d..cecf8ef5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,10 +16,11 @@ 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.62 2004/02/25 02:01:05 rocky Exp $])dnl
+AC_REVISION([$Id: configure.ac,v 1.63 2004/02/27 02:35:24 rocky Exp $])dnl
 AC_INIT(libcdio, 0.67cvs)
 AC_CONFIG_SRCDIR(src/cd-info.c)
 AM_INIT_AUTOMAKE
+AC_CANONICAL_HOST
 AM_CONFIG_HEADER(config.h)
 
 AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir)
@@ -36,6 +37,10 @@ AC_ARG_WITH(cd_read,
 [  --without-cd-read	build program cd-read (enabled by default)],
 enable_cd_read="${withval}", enable_cd_read=yes)
 
+AC_ARG_WITH(cd_info,
+[  --without-versioned-libs	build versioned library symbols (enabled by default)],
+enable_versioned_libs="${withval}", enable_versioned_libs=yes)
+
 dnl Checks for programs.
 AC_PROG_CC
 
@@ -169,9 +174,17 @@ LIBS="$LIBS -lm"
 CFLAGS="$CFLAGS $WARN_CFLAGS"
 
 AM_CONDITIONAL(CYGWIN, test "x$CYGWIN" = "xyes")
+case "$host_os" in
+  freebsd4* | netbsd* | bsdi* ) 
+     enable_versioned_libs=no
+     ;;
+  * )
+esac
+
 AM_CONDITIONAL(BUILD_CDINFO, test "x$enable_cd_info" = "xyes")
 AM_CONDITIONAL(BUILD_CDINFO_LINUX, test "x$enable_cd_info_linux" = "xyes")
 AM_CONDITIONAL(BUILD_CDIOTEST, test "x$enable_cdiotest" = "xyes")
+AM_CONDITIONAL(BUILD_VERSIONED_LIBS, test "x$enable_versioned_libs" = "xyes")
 
 AM_PROG_LIBTOOL
      
diff --git a/doc/libcdio.texi b/doc/libcdio.texi
index 3097b4dc..5401d637 100644
--- a/doc/libcdio.texi
+++ b/doc/libcdio.texi
@@ -46,7 +46,7 @@ development.''
 
 @titlepage
 @title GNU libcdio library
-@subtitle $Id: libcdio.texi,v 1.15 2004/02/26 12:24:22 rocky Exp $
+@subtitle $Id: libcdio.texi,v 1.16 2004/02/27 02:35:24 rocky Exp $
 @author Rocky Bernstein et al.
 @page
 
@@ -572,7 +572,8 @@ device that is right for it.
 @section Example 3: figure out what kind of CD image we've got
 
 In this example is a somewhat simplified program to show the use of
-@command{cdio_guess_cd_type()} to  figure out the kind of CD image we've got.
+@command{cdio_guess_cd_type()} to  figure out the kind of CD image
+we've got. This can be in the distribution as @file{example/sample3.c}.
 
 @smallexample
 #ifdef HAVE_CONFIG_H
@@ -756,6 +757,11 @@ main(int argc, const char *argv[])
 @node Example 4
 @section Example 4: use libiso9660 to extract a file from an ISO-9660 image
 
+Next a program to show using @command{libiso9660} to extract a file
+from an ISO-9660 image.  This can be in the distribution as
+@file{example/sample7.c}. A more complete and expanded version of this
+is @command{iso-read}, part of this distribution.
+
 @smallexample
 /* This is the ISO 9660 image. */
 #define ISO9660_IMAGE_PATH "../"
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 736dca26..35f3e076 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-#   $Id: Makefile.am,v 1.22 2004/02/12 01:46:38 rocky Exp $
+#   $Id: Makefile.am,v 1.23 2004/02/27 02:35:24 rocky Exp $
 #
 #    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
 #
@@ -83,7 +83,7 @@ libcdio_sources = \
 lib_LTLIBRARIES    = libcdio.la libiso9660.la
 
 libcdio_la_SOURCES = $(libcdio_sources)
-libcdio_la_LDFLAGS = -version-info $(libcdio_la_CURRENT):$(libcdio_la_REVISION):$(libcdio_la_AGE)
+libcdio_la_ldflags = -version-info $(libcdio_la_CURRENT):$(libcdio_la_REVISION):$(libcdio_la_AGE)
 
 libiso9660_la_SOURCES = \
 	iso9660.c \
@@ -92,8 +92,8 @@ libiso9660_la_SOURCES = \
 	xa.c
 
 libiso9660_la_LIBADD = libcdio.la
-libiso9660_la_LDFLAGS = -version-info $(libiso9660_la_CURRENT):$(libiso9660_la_REVISION):$(libiso9660_la_AGE)
-libiso9660_la_DEPENDENCIES = libcdio.la
+libiso9660_la_ldflags = -version-info $(libiso9660_la_CURRENT):$(libiso9660_la_REVISION):$(libiso9660_la_AGE)
+libiso9660_la_dependencies = libcdio.la
 
 INCLUDES = -I$(LIBCDIO_CFLAGS)
 
@@ -156,23 +156,32 @@ INCLUDES = -I$(LIBCDIO_CFLAGS)
 # command comes from libtool.)
 
 libcdio_la_MAJOR := $(shell expr $(libcdio_la_CURRENT) - $(libcdio_la_AGE))
-libcdio_la_LDFLAGS += -Wl,--version-script=libcdio.la.ver
+if BUILD_VERSIONED_LIBS
+libcdio_la_LDFLAGS = $(libcdio_la_ldflags) -Wl,--version-script=libcdio.la.ver
 libcdio_la_DEPENDENCIES = libcdio.la.ver
 
 libcdio.la.ver: $(libcdio_la_OBJECTS)
 	echo 'CDIO_$(libcdio_la_MAJOR) { ' > $@
 	echo "  global:" >> $@
-	nm $(patsubst %lo,%o,$(libcdio_la_OBJECTS)) | sed -n -e 's/^.*[ 	][ABCDGIRSTW][ABCDGIRSTW]*[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$$/    \1;/p' | sort | uniq >> $@
+	nm $(patsubst %.lo,%.o,$(libcdio_la_OBJECTS)) | sed -n -e 's/^.*[ 	][ABCDGIRSTW][ABCDGIRSTW]*[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$$/    \1;/p' | sort | uniq >> $@
 	echo '};' >> $@
+else 
+libcdio_la_LDFLAGS = $(libcdio_la_ldflags)
+endif 
 
 libiso9660_la_MAJOR := $(shell expr $(libiso9660_la_CURRENT) - $(libiso9660_la_AGE))
-libiso9660_la_LDFLAGS += -Wl,--version-script=libiso9660.la.ver
-libiso9660_la_DEPENDENCIES += libiso9660.la.ver
+if BUILD_VERSIONED_LIBS
+libiso9660_la_LDFLAGS = $(libiso9660_la_ldflags) -Wl,--version-script=libiso9660.la.ver
+libiso9660_la_DEPENDENCIES = $(libcdio9660_la_dependencies) libiso9660.la.ver
 
 libiso9660.la.ver: $(libiso9660_la_OBJECTS)
 	echo 'ISO9660_$(libiso9660_la_MAJOR) {' > $@
 	echo "  global:" >> $@
-	nm $(patsubst %lo,%o,$(libiso9660_la_OBJECTS)) | sed -n -e 's/^.*[ 	][ABCDGIRSTW][ABCDGIRSTW]*[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$$/    \1;/p' | sort | uniq >> $@
+	nm $(patsubst %.lo,%.o,$(libiso9660_la_OBJECTS)) | sed -n -e 's/^.*[ 	][ABCDGIRSTW][ABCDGIRSTW]*[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$$/    \1;/p' | sort | uniq >> $@
 	echo '};' >> $@
 
 MOSTLYCLEANFILES = libcdio.la.ver libiso9660.la.ver
+else 
+libiso9660_la_LDFLAGS = $(libiso9660_la_ldflags)
+libiso9660_la_DEPENDENCIES = $(libcdio9660_la_dependencies)
+endif