diff --git a/lib/driver/Makefile.am b/lib/driver/Makefile.am
index ba978662..0d7896c6 100644
--- a/lib/driver/Makefile.am
+++ b/lib/driver/Makefile.am
@@ -1,6 +1,6 @@
-#   $Id: Makefile.am,v 1.4 2005/01/09 16:07:46 rocky Exp $
+#   $Id: Makefile.am,v 1.5 2005/01/11 00:34:10 rocky Exp $
 #
-#    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+#    Copyright (C) 2003, 2004, 2005 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
@@ -166,10 +166,8 @@ libcdio_la_DEPENDENCIES = libcdio.la.ver
 
 libcdio.la.ver: $(libcdio_la_OBJECTS) $(srcdir)/libcdio.sym
 	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 -u | while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio.sym; then echo "    $${symbol};"; fi; done >> $@
-	echo "  local:" >> $@
-	nm $(patsubst %.lo,%.o,$(libcdio_la_OBJECTS)) | sed -n -e 's/^.*[ 	][ABCDGIRSTW][ABCDGIRSTW]*[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio.sym; then :; else echo "    $${symbol};"; fi; done >> $@
+	nm $(patsubst %.lo,%.o,$(libcdio_la_OBJECTS)) | sed -n -e 's/^.*[ 	][ABCDGIRSTW][ABCDGIRSTW]*[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio.sym; then if test $$first = true; then echo "  global:"; first=false; fi; echo "    $${symbol};"; fi; done; } >> $@
+	nm $(patsubst %.lo,%.o,$(libcdio_la_OBJECTS)) | sed -n -e 's/^.*[ 	][ABCDGIRSTW][ABCDGIRSTW]*[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libcdio.sym; then :; else if test $$first = true; then echo "  local:"; first=false; fi; echo "    $${symbol};"; fi; done; } >> $@
 	echo '};' >> $@
 else 
 libcdio_la_LDFLAGS = $(libcdio_la_ldflags)
diff --git a/lib/iso9660/Makefile.am b/lib/iso9660/Makefile.am
index 80527ea1..ccc4f4c7 100644
--- a/lib/iso9660/Makefile.am
+++ b/lib/iso9660/Makefile.am
@@ -1,6 +1,6 @@
-#   $Id: Makefile.am,v 1.2 2004/12/22 10:04:46 rocky Exp $
+#   $Id: Makefile.am,v 1.3 2005/01/11 00:34:10 rocky Exp $
 #
-#    Copyright (C) 2003, 2004 Rocky Bernstein <rocky@panix.com>
+#    Copyright (C) 2003, 2004, 2005 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
@@ -129,10 +129,8 @@ libiso9660_la_DEPENDENCIES = $(libcdio9660_la_dependencies) libiso9660.la.ver
 
 libiso9660.la.ver: $(libiso9660_la_OBJECTS) $(srcdir)/libiso9660.sym
 	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 -u | while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libiso9660.sym; then echo "    $${symbol};"; fi; done >> $@
-	echo "  local:" >> $@
-	nm $(patsubst %.lo,%.o,$(libiso9660_la_OBJECTS)) | sed -n -e 's/^.*[ 	][ABCDGIRSTW][ABCDGIRSTW]*[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libiso9660.sym; then :; else echo "    $${symbol};"; fi; done >> $@
+	nm $(patsubst %.lo,%.o,$(libiso9660_la_OBJECTS)) | sed -n -e 's/^.*[ 	][ABCDGIRSTW][ABCDGIRSTW]*[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libiso9660.sym; then if test $$first = true; then echo "  global:"; first=false; fi; echo "    $${symbol};"; fi; done; } >> $@
+	nm $(patsubst %.lo,%.o,$(libiso9660_la_OBJECTS)) | sed -n -e 's/^.*[ 	][ABCDGIRSTW][ABCDGIRSTW]*[ 	][ 	]*\([_A-Za-z][_A-Za-z0-9]*\)$$/\1/p' | sort -u | { first=true; while read symbol; do if grep -q "^$${symbol}\$$" $(srcdir)/libiso9660.sym; then :; else if test $$first = true; then echo "  local:"; first=false; fi; echo "    $${symbol};"; fi; done; } >> $@
 	echo '};' >> $@
 
 MOSTLYCLEANFILES = libiso9660.la.ver
diff --git a/lib/iso9660/libiso9660.sym b/lib/iso9660/libiso9660.sym
index 41b9fddf..c18cade9 100644
--- a/lib/iso9660/libiso9660.sym
+++ b/lib/iso9660/libiso9660.sym
@@ -1,7 +1,7 @@
 iso9660_close
 iso9660_dir_add_entry_su
 iso9660_dir_calc_record_size
-iso9660_dir_init_new;
+iso9660_dir_init_new
 iso9660_dir_init_new_su
 iso9660_dir_to_name
 iso9660_dirname_valid_p