@@ -14,11 +14,11 @@
 	echo "Usage: build_osx.sh <target>"
 	echo Where target is one of:
 	echo "    leopard  - (Builds Universal 10.5 Library for PPCG4/i386)"
 	echo "    snowleopard  - (Builds Universal 10.6 Library for i386/x86_64)"
 	echo "    lion  - (Builds Universal 10.7 Library for i386/x86_64)"
-	echo "    sltoml - (Builds Universal 10.6/10.7/10.8 Library for i386/x86_64)"
+	echo "    sltomav - (Builds Universal 10.6/10.7/10.8/10.9 Library for i386/x86_64)"
 	echo "    all - (Builds for all supported targets)"
 	echo "    clean - (Cleans up)"
 	echo "Run from CACKey Build Root."
 	exit $?
 }
@@ -43,11 +43,11 @@
 	if [ ! -d macbuild ]; then
 		mkdir macbuild
 		mkdir macbuild/Leopard
 		mkdir macbuild/Snowleopard
 		mkdir macbuild/Lion
-		mkdir macbuild/Sltoml
+		mkdir macbuild/Sltomav
 		mkdir macbuild/pkg
 	fi
 	if [ ! -f config.guess ]; then
 		cp ${LIBTOOLDIR}/config.guess .
 	fi
@@ -68,11 +68,10 @@
 	ARCHLIST=""
 	DLIB=""
 	DARCHLIST=""
 	OSX=Leopard
 	PKTARGETOS=3
-	NEXTOSXVER=10.6
 	CUROSXVER=10.5
 	for HOST in powerpc-apple-darwin9 i386-apple-darwin9; do
 		genbuild
 	done
 	libbuild
@@ -88,11 +87,10 @@
 	ARCHLIST=""
 	DLIB=""
 	DARCHLIST=""
 	OSX=Snowleopard
 	PKTARGETOS=3
-	NEXTOSXVER=10.7
 	CUROSXVER=10.6
 	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
 		genbuild
 	done
 	libbuild
@@ -108,51 +106,48 @@
 	ARCHLIST=""
 	DLIB=""
 	DARCHLIST=""
 	OSX=Lion
 	PKTARGETOS=3
-	NEXTOSXVER=10.8
 	CUROSXVER=10.7
 	for HOST in i386-apple-darwin11 x86_64-apple-darwin11; do
 		genbuild
 	done
 	libbuild
 	pkgbuild
 }
 
 # Build function for Snow Leopard/Lion/Mountain Lion
-sltoml() {
+sltomav() {
 	makedir
 	HEADERS=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/Versions/A/Headers/
 	LIBRARY=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/PCSC
 	LIB=""
 	ARCHLIST=""
 	DLIB=""
 	DARCHLIST=""
-	OSX=Sltoml
+	OSX=Sltomav
 	PKTARGETOS=3
-	NEXTOSXVER=10.9
 	CUROSXVER=10.6
 	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
 		genbuild
 	done
 	libbuild
 	pkgbuild
 }
 
 # Build function for Snow Leopard/Lion/Mountain Lion
-sltoml() {
+sltomav() {
 	makedir
 	HEADERS=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/Versions/A/Headers/
 	LIBRARY=/Developer/SDKs/MacOSX10.6.sdk/System/Library/Frameworks/PCSC.framework/PCSC
 	LIB=""
 	ARCHLIST=""
 	DLIB=""
 	DARCHLIST=""
-	OSX=Sltoml
+	OSX=Sltomav
 	PKTARGETOS=3
-	NEXTOSXVER=10.9
 	CUROSXVER=10.6
 	for HOST in i386-apple-darwin10 x86_64-apple-darwin10; do
 		genbuild
 	done
 	libbuild
@@ -225,11 +220,10 @@
 		mkdir -p build/cackey_osx_build/${OSX}_pmbuild.pmdoc
 		sed "s|@@BUILDROOTDIR@@|$(pwd)|g" build/cackey_osx_build/Template_pmbuild/${PMDOC}.in > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
 		sed "s|@@OSXVERSION@@|${OSX}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
 		sed "s|@@UUID@@|${UUID}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
 		sed "s|@@TARGETOS@@|${PKTARGETOS}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
-		sed "s|@@NEXTOSXVER@@|${NEXTOSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
 		sed "s|@@CUROSXVER@@|${CUROSXVER}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
 		sed "s|@@LIBCACKEYG@@|${LIBCACKEYG}|g" build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
 		cp build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC} build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1
 		mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}.1 build/cackey_osx_build/${OSX}_pmbuild.pmdoc/${PMDOC}
 	done
@@ -236,12 +230,12 @@
 	EXT=pkg
 	if [ ${OSX} == "Snowleopard" ]; then
 		cat build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml | sed 's|for Mac OS X Snowleopard|for Mac OS X SnowLeopard|g' > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new
 		mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml
 	fi
-	if [ ${OSX} == "Sltoml" ]; then
-		cat build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml | sed 's|for Mac OS X Sltoml|for Mac OS X SLtoML|g' > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new
+	if [ ${OSX} == "Sltomav" ]; then
+		cat build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml | sed 's|for Mac OS X Sltomav|for Mac OS X SLtoMav|g' > build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new
 		mv build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml.new build/cackey_osx_build/${OSX}_pmbuild.pmdoc/index.xml
 	fi
 	/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -d build/cackey_osx_build/${OSX}_pmbuild.pmdoc -o macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}
 	tar --create --directory macbuild/pkg/ --file macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}.tar CACKey_${CACKEY_VERSION}_${OSX}.${EXT}
 	gzip -9 macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}.tar
@@ -274,20 +268,20 @@
 		./autogen.sh
 		lion
 		exit $?
 	;;
 	
-	"sltoml")
+	"sltomav")
 		./autogen.sh
-		sltoml
+		sltomav
 		exit $?
 	;;
 
 	"all")
 		./autogen.sh
 		leopard
-		sltoml
+		sltomav
 		echo ""
 		echo "All builds complete."
 		exit $?
 	;;