Index: build/cackey_osx_build/Leopard_pmbuild.pmdoc/01libcackey.xml
==================================================================
--- build/cackey_osx_build/Leopard_pmbuild.pmdoc/01libcackey.xml
+++ build/cackey_osx_build/Leopard_pmbuild.pmdoc/01libcackey.xml
@@ -1,1 +1,29 @@
-<pkgref spec="1.12" uuid="E0C4023B-5D9C-4A6A-8855-14DBA17A436E"><config><identifier>mil.army.usace.cackeyForMacOsXLeopard.libcackey.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../../macbuild/Leopard/libcackey.dylib</installFrom><installTo mod="true" relocatable="true">/Library/CACKey/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>relocatable</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>installTo</mod></config><contents><file-list>01libcackey-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="E0C4023B-5D9C-4A6A-8855-14DBA17A436E">
+	<config>
+		<identifier>mil.army.usace.cackeyForMacOsXLeopard.libcackey.pkg</identifier>
+		<version>1</version>
+		<description></description>
+		<post-install type="none"/>
+		<requireAuthorization/>
+		<installFrom relative="true" mod="true">../../macbuild/Leopard/libcackey.dylib</installFrom>
+		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
+		<flags>
+			<followSymbolicLinks/>
+		</flags>
+		<packageStore type="internal"></packageStore>
+		<mod>parent</mod>
+		<mod>scripts.postinstall.path</mod>
+		<mod>relocatable</mod>
+		<mod>installTo.path</mod>
+		<mod>installFrom.path</mod>
+		<mod>installTo</mod>
+	</config>
+	<contents>
+		<file-list>01libcackey-contents.xml</file-list>
+		<filter>/CVS$</filter>
+		<filter>/\.svn$</filter>
+		<filter>/\.cvsignore$</filter>
+		<filter>/\.cvspass$</filter>
+		<filter>/\.DS_Store$</filter>
+	</contents>
+</pkgref>

Index: build/cackey_osx_build/Leopard_pmbuild.pmdoc/02libcackey.xml
==================================================================
--- build/cackey_osx_build/Leopard_pmbuild.pmdoc/02libcackey.xml
+++ build/cackey_osx_build/Leopard_pmbuild.pmdoc/02libcackey.xml
@@ -1,1 +1,29 @@
-<pkgref spec="1.12" uuid="EA4726BC-BC16-4BD1-A387-2E2165C5E7C9"><config><identifier>mil.army.usace.cackeyForMacOsXLeopard.libcackeyg.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../../macbuild/Leopard/libcackey_g.dylib</installFrom><installTo mod="true" relocatable="true">/Library/CACKey/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>relocatable</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>installTo</mod></config><contents><file-list>02libcackey-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="EA4726BC-BC16-4BD1-A387-2E2165C5E7C9">
+	<config>
+		<identifier>mil.army.usace.cackeyForMacOsXLeopard.libcackeyg.pkg</identifier>
+		<version>1</version>
+		<description></description>
+		<post-install type="none"/>
+		<requireAuthorization/>
+		<installFrom relative="true" mod="true">../../macbuild/Leopard/libcackey_g.dylib</installFrom>
+		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
+		<flags>
+			<followSymbolicLinks/>
+		</flags>
+		<packageStore type="internal"></packageStore>
+		<mod>parent</mod>
+		<mod>scripts.postinstall.path</mod>
+		<mod>relocatable</mod>
+		<mod>installTo.path</mod>
+		<mod>installFrom.path</mod>
+		<mod>installTo</mod>
+	</config>
+	<contents>
+		<file-list>02libcackey-contents.xml</file-list>
+		<filter>/CVS$</filter>
+		<filter>/\.svn$</filter>
+		<filter>/\.cvsignore$</filter>
+		<filter>/\.cvspass$</filter>
+		<filter>/\.DS_Store$</filter>
+	</contents>
+</pkgref>

Index: build/cackey_osx_build/Leopard_pmbuild.pmdoc/index.xml
==================================================================
--- build/cackey_osx_build/Leopard_pmbuild.pmdoc/index.xml
+++ build/cackey_osx_build/Leopard_pmbuild.pmdoc/index.xml
@@ -1,17 +1,44 @@
-<pkmkdoc spec="1.12"><properties><title>CACKey for Mac OS X Leopard</title><build>/Users/kvanals/Desktop/cackey/release/cackey-0.5.15/macbuild/pkg/cackey_leopard.pkg</build><organization>mil.army.usace</organization><userSees ui="both"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>CACKey</description><contents><choice title="libcackey" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="mil.army.usace.cackeyForMacOsXLeopard.libcackey.pkg"/></choice><choice title="libcackey_g" id="cackeydebug" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="mil.army.usace.cackeyForMacOsXLeopard.libcackeyg.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+<pkmkdoc spec="1.12">
+	<properties>
+		<title>CACKey for Mac OS X Leopard</title>
+		<build>/Users/kvanals/Desktop/cackey/release/cackey-0.5.15/macbuild/pkg/cackey_leopard.pkg</build>
+		<organization>mil.army.usace</organization>
+		<userSees ui="both"/>
+		<min-target os="3"/>
+		<domain system="true"/>
+	</properties>
+	<distribution>
+		<versions min-spec="1.000000"/>
+		<scripts></scripts>
+	</distribution>
+	<description>CACKey</description>
+	<contents>
+		<choice title="CACKey PKCS#11 Library (Core)" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false">
+			<pkgref id="mil.army.usace.cackeyForMacOsXLeopard.libcackey.pkg"/>
+			<pkgref id="mil.army.usace.cackeyForMacOsXLeopard.cackey.pkg"/>
+		</choice>
+		<choice title="CACKey PKCS#11 Library (Debug)" id="cackeydebug" starts_selected="true" starts_enabled="true" starts_hidden="false">
+			<pkgref id="mil.army.usace.cackeyForMacOsXLeopard.libcackeyg.pkg"/>
+		</choice>
+	</contents>
+	<resources bg-scale="none" bg-align="topleft">
+		<locale lang="en">
+			<resource mime-type="text/rtf" kind="embedded" type="license">
+				<![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 Release information:\
     pkg: CACKey\
  author: US Army Corps of Engineers\
+Mac build contact: Kenneth Van Alstyne <kenneth.l.vanalstyne@usace.army.mil>\
+                   US Army Corps of Engineers\
+                   Information Technology Laboratory\
+                   Vicksburg, MS 39180\
 contact: Roy Keene <roy.s.keene@usace.army.mil>\
-         US Army Corps of Engineers\
-         Information Technology Laboratory\
-         Vicksburg, MS 39180\
 ------------------------------------------------\
 \
 The following files in the source directory are the intellectual property of the\
 Free Software Foundation and are licensed under the terms of the GNU General\
 Public License (GPL):\
@@ -26,15 +53,40 @@
 following licenses:\
 	mypkcs11.h : GNU General Public License 2.1.\
 	pkcs11.h   : GNU General Public License 2.1.\
 	pkcs11f.h  : GNU General Public License 2.1.\
 	pkcs11n.h  : Mozilla Public License or GNU General Public License\
-	pkcs11t.h  : GNU General Public License 2.1.}]]></resource><resource mime-type="text/rtf" kind="embedded" type="readme"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+	pkcs11t.h  : GNU General Public License 2.1.}]]>
+			</resource>
+			<resource mime-type="text/rtf" kind="embedded" type="readme">
+				<![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 Thank you for choosing to install CACKey.\
 \
-To use CACKey, install /Library/CACKey/libcackey.dylib as a security module into any application that can use a PKCS#11 provider.\
+To use CACKey, install /Library/CACKey/libcackey.dylib or\
+/usr/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
 \
-A debug version, libcackey_g.dylib is provided if debug output is necessary.}]]></resource></locale></resources><requirements><requirement id="tosv" operator="lt" value="'10.6'"><message>This CACKey release requires Mac OS X 10.5.</message></requirement><requirement id="tosv" operator="ge" value="'10.5'"><message>This CACKey release requires Mac OS X 10.5.</message></requirement></requirements><flags/><item type="file">01libcackey.xml</item><item type="file">02libcackey.xml</item><mod>properties.customizeOption</mod><mod>properties.title</mod><mod>description</mod><mod>properties.systemDomain</mod><mod>properties.anywhereDomain</mod></pkmkdoc>
+A debug version, /Library/CACKey/libcackey_g.dylib is provided if debug output is necessary.}]]>
+			</resource>
+		</locale>
+	</resources>
+	<requirements>
+		<requirement id="tosv" operator="lt" value="'10.6'">
+			<message>This CACKey release requires Mac OS X 10.5.</message>
+		</requirement>
+		<requirement id="tosv" operator="ge" value="'10.5'">
+			<message>This CACKey release requires Mac OS X 10.5.</message>
+		</requirement>
+	</requirements>
+	<flags/>
+	<item type="file">01libcackey.xml</item>
+	<item type="file">02libcackey.xml</item>
+	<item type="file">03libcackey.xml</item>
+	<mod>properties.customizeOption</mod>
+	<mod>properties.title</mod>
+	<mod>description</mod>
+	<mod>properties.systemDomain</mod>
+	<mod>properties.anywhereDomain</mod>
+</pkmkdoc>

Index: build/cackey_osx_build/Panther_pmbuild.pmdoc/01libcackey.xml
==================================================================
--- build/cackey_osx_build/Panther_pmbuild.pmdoc/01libcackey.xml
+++ build/cackey_osx_build/Panther_pmbuild.pmdoc/01libcackey.xml
@@ -1,1 +1,33 @@
-<pkgref spec="1.12" uuid="C600D784-E505-4FE6-A6C0-F0F65D56B0D8"><config><identifier>mil.army.usace.cackeyForMacOsXPanther.libcackey.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../../macbuild/Panther/libcackey.dylib</installFrom><installTo mod="true" relocatable="true">/Library/CACKey/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>installTo.isAbsoluteType</mod><mod>installTo.isRelativeType</mod><mod>scripts.postflight.path</mod><mod>relocatable</mod><mod>version</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>installTo</mod></config><contents><file-list>01libcackey-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="C600D784-E505-4FE6-A6C0-F0F65D56B0D8">
+	<config>
+		<identifier>mil.army.usace.cackeyForMacOsXPanther.libcackey.pkg</identifier>
+		<version>1</version>
+		<description></description>
+		<post-install type="none"/>
+		<requireAuthorization/>
+		<installFrom relative="true" mod="true">../../macbuild/Panther/libcackey.dylib</installFrom>
+		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
+		<flags>
+			<followSymbolicLinks/>
+		</flags>
+		<packageStore type="internal"></packageStore>
+		<mod>parent</mod>
+		<mod>scripts.postinstall.path</mod>
+		<mod>installTo.isAbsoluteType</mod>
+		<mod>installTo.isRelativeType</mod>
+		<mod>scripts.postflight.path</mod>
+		<mod>relocatable</mod>
+		<mod>version</mod>
+		<mod>installTo.path</mod>
+		<mod>installFrom.path</mod>
+		<mod>installTo</mod>
+	</config>
+	<contents>
+		<file-list>01libcackey-contents.xml</file-list>
+		<filter>/CVS$</filter>
+		<filter>/\.svn$</filter>
+		<filter>/\.cvsignore$</filter>
+		<filter>/\.cvspass$</filter>
+		<filter>/\.DS_Store$</filter>
+	</contents>
+</pkgref>

Index: build/cackey_osx_build/Panther_pmbuild.pmdoc/02libcackey.xml
==================================================================
--- build/cackey_osx_build/Panther_pmbuild.pmdoc/02libcackey.xml
+++ build/cackey_osx_build/Panther_pmbuild.pmdoc/02libcackey.xml
@@ -1,1 +1,30 @@
-<pkgref spec="1.12" uuid="488A2642-E2C6-4E59-9DB0-B4C125EB1522"><config><identifier>mil.army.usace.cackeyForMacOsXPanther.libcackeyg.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../../macbuild/Panther/libcackey_g.dylib</installFrom><installTo mod="true" relocatable="true">/Library/CACKey/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>relocatable</mod><mod>version</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>installTo</mod></config><contents><file-list>02libcackey-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="488A2642-E2C6-4E59-9DB0-B4C125EB1522">
+	<config>
+		<identifier>mil.army.usace.cackeyForMacOsXPanther.libcackeyg.pkg</identifier>
+		<version>1</version>
+		<description></description>
+		<post-install type="none"/>
+		<requireAuthorization/>
+		<installFrom relative="true" mod="true">../../macbuild/Panther/libcackey_g.dylib</installFrom>
+		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
+		<flags>
+			<followSymbolicLinks/>
+		</flags>
+		<packageStore type="internal"></packageStore>
+		<mod>parent</mod>
+		<mod>scripts.postinstall.path</mod>
+		<mod>relocatable</mod>
+		<mod>version</mod>
+		<mod>installTo.path</mod>
+		<mod>installFrom.path</mod>
+		<mod>installTo</mod>
+	</config>
+	<contents>
+		<file-list>02libcackey-contents.xml</file-list>
+		<filter>/CVS$</filter>
+		<filter>/\.svn$</filter>
+		<filter>/\.cvsignore$</filter>
+		<filter>/\.cvspass$</filter>
+		<filter>/\.DS_Store$</filter>
+	</contents>
+</pkgref>

Index: build/cackey_osx_build/Panther_pmbuild.pmdoc/index.xml
==================================================================
--- build/cackey_osx_build/Panther_pmbuild.pmdoc/index.xml
+++ build/cackey_osx_build/Panther_pmbuild.pmdoc/index.xml
@@ -1,17 +1,44 @@
-<pkmkdoc spec="1.12"><properties><title>CACKey for Mac OS X Panther</title><build>/Users/kvanals/Desktop/cackey/release/cackey-0.5.15/macbuild/pkg/CACKey_Panther.mpkg</build><organization>mil.army.usace</organization><userSees ui="both"/><min-target os="1"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>CACKey</description><contents><choice title="libcackey" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="mil.army.usace.cackeyForMacOsXPanther.libcackey.pkg"/></choice><choice title="libcackey_g" id="cackeydebug" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="mil.army.usace.cackeyForMacOsXPanther.libcackeyg.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+<pkmkdoc spec="1.12">
+	<properties>
+		<title>CACKey for Mac OS X Panther</title>
+		<build>/Users/kvanals/Desktop/cackey/release/cackey-0.5.15/macbuild/pkg/CACKey_Panther.mpkg</build>
+		<organization>mil.army.usace</organization>
+		<userSees ui="both"/>
+		<min-target os="1"/>
+		<domain system="true"/>
+	</properties>
+	<distribution>
+		<versions min-spec="1.000000"/>
+		<scripts></scripts>
+	</distribution>
+	<description>CACKey</description>
+	<contents>
+		<choice title="CACKey PKCS#11 Library (Core)" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false">
+			<pkgref id="mil.army.usace.cackeyForMacOsXPanther.libcackey.pkg"/>
+			<pkgref id="mil.army.usace.cackeyForMacOsXPanther.cackey.pkg"/>
+		</choice>
+		<choice title="CACKey PKCS#11 Library (Debug)" id="cackeydebug" starts_selected="true" starts_enabled="true" starts_hidden="false">
+			<pkgref id="mil.army.usace.cackeyForMacOsXPanther.libcackeyg.pkg"/>
+		</choice>
+	</contents>
+	<resources bg-scale="none" bg-align="topleft">
+		<locale lang="en">
+			<resource mime-type="text/rtf" kind="embedded" type="license">
+				<![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 Release information:\
     pkg: CACKey\
  author: US Army Corps of Engineers\
+Mac build contact: Kenneth Van Alstyne <kenneth.l.vanalstyne@usace.army.mil>\
+                   US Army Corps of Engineers\
+                   Information Technology Laboratory\
+                   Vicksburg, MS 39180\
 contact: Roy Keene <roy.s.keene@usace.army.mil>\
-         US Army Corps of Engineers\
-         Information Technology Laboratory\
-         Vicksburg, MS 39180\
 ------------------------------------------------\
 \
 The following files in the source directory are the intellectual property of the\
 Free Software Foundation and are licensed under the terms of the GNU General\
 Public License (GPL):\
@@ -26,16 +53,32 @@
 following licenses:\
 	mypkcs11.h : GNU General Public License 2.1.\
 	pkcs11.h   : GNU General Public License 2.1.\
 	pkcs11f.h  : GNU General Public License 2.1.\
 	pkcs11n.h  : Mozilla Public License or GNU General Public License\
-	pkcs11t.h  : GNU General Public License 2.1.\
-}]]></resource><resource mime-type="text/rtf" kind="embedded" type="readme"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+	pkcs11t.h  : GNU General Public License 2.1.}]]>
+			</resource>
+			<resource mime-type="text/rtf" kind="embedded" type="readme">
+				<![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 Thank you for choosing to install CACKey.\
 \
-To use CACKey, install /Library/CACKey/libcackey.dylib as a security module into any application that can use a PKCS#11 provider.\
+To use CACKey, install /Library/CACKey/libcackey.dylib or\
+/usr/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
 \
-A debug version, libcackey_g.dylib is provided if debug output is necessary.}]]></resource></locale></resources><flags/><item type="file">01libcackey.xml</item><item type="file">02libcackey.xml</item><mod>properties.customizeOption</mod><mod>properties.title</mod><mod>description</mod><mod>properties.systemDomain</mod><mod>properties.anywhereDomain</mod></pkmkdoc>
+A debug version, /Library/CACKey/libcackey_g.dylib is provided if debug output is necessary.}]]>
+			</resource>
+		</locale>
+	</resources>
+	<flags/>
+	<item type="file">01libcackey.xml</item>
+	<item type="file">02libcackey.xml</item>
+	<item type="file">03libcackey.xml</item>
+	<mod>properties.customizeOption</mod>
+	<mod>properties.title</mod>
+	<mod>description</mod>
+	<mod>properties.systemDomain</mod>
+	<mod>properties.anywhereDomain</mod>
+</pkmkdoc>

Index: build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/01libcackey.xml
==================================================================
--- build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/01libcackey.xml
+++ build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/01libcackey.xml
@@ -1,1 +1,29 @@
-<pkgref spec="1.12" uuid="010A80A7-8A23-4C6C-86FB-07FAB90BE89A"><config><identifier>mil.army.usace.cackeyForMacOsXSnowLeopard.libcackey.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../../macbuild/SnowLeopard/libcackey.dylib</installFrom><installTo mod="true" relocatable="true">/Library/CACKey/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>relocatable</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>installTo</mod></config><contents><file-list>01libcackey-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="010A80A7-8A23-4C6C-86FB-07FAB90BE89A">
+	<config>
+		<identifier>mil.army.usace.cackeyForMacOsXSnowLeopard.libcackey.pkg</identifier>
+		<version>1</version>
+		<description></description>
+		<post-install type="none"/>
+		<requireAuthorization/>
+		<installFrom relative="true" mod="true">../../macbuild/SnowLeopard/libcackey.dylib</installFrom>
+		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
+		<flags>
+			<followSymbolicLinks/>
+		</flags>
+		<packageStore type="internal"></packageStore>
+		<mod>parent</mod>
+		<mod>scripts.postinstall.path</mod>i
+		<mod>relocatable</mod>
+		<mod>installTo.path</mod>
+		<mod>installFrom.path</mod>
+		<mod>installTo</mod>
+	</config>
+	<contents>
+		<file-list>01libcackey-contents.xml</file-list>
+		<filter>/CVS$</filter>
+		<filter>/\.svn$</filter>
+		<filter>/\.cvsignore$</filter>
+		<filter>/\.cvspass$</filter>
+		<filter>/\.DS_Store$</filter>
+	</contents>
+</pkgref>

Index: build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/02libcackey.xml
==================================================================
--- build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/02libcackey.xml
+++ build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/02libcackey.xml
@@ -1,1 +1,29 @@
-<pkgref spec="1.12" uuid="40DE63F7-E529-4A52-AD8F-1193B60A17CD"><config><identifier>mil.army.usace.cackeyForMacOsXSnowLeopard.libcackeyg.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../../macbuild/SnowLeopard/libcackey_g.dylib</installFrom><installTo mod="true" relocatable="true">/Library/CACKey/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>relocatable</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>installTo</mod></config><contents><file-list>02libcackey-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="40DE63F7-E529-4A52-AD8F-1193B60A17CD">
+	<config>
+		<identifier>mil.army.usace.cackeyForMacOsXSnowLeopard.libcackeyg.pkg</identifier>
+		<version>1</version>
+		<description></description>
+		<post-install type="none"/>
+		<requireAuthorization/>
+		<installFrom relative="true" mod="true">../../macbuild/SnowLeopard/libcackey_g.dylib</installFrom>
+		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
+		<flags>
+			<followSymbolicLinks/>
+		</flags>
+		<packageStore type="internal"></packageStore>
+		<mod>parent</mod>
+		<mod>scripts.postinstall.path</mod>
+		<mod>relocatable</mod>
+		<mod>installTo.path</mod>
+		<mod>installFrom.path</mod>
+		<mod>installTo</mod>
+	</config>
+	<contents>
+		<file-list>02libcackey-contents.xml</file-list>
+		<filter>/CVS$</filter>
+		<filter>/\.svn$</filter>
+		<filter>/\.cvsignore$</filter>
+		<filter>/\.cvspass$</filter>
+		<filter>/\.DS_Store$</filter>
+	</contents>
+</pkgref>

Index: build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/index.xml
==================================================================
--- build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/index.xml
+++ build/cackey_osx_build/SnowLeopard_pmbuild.pmdoc/index.xml
@@ -1,17 +1,42 @@
-<pkmkdoc spec="1.12"><properties><title>CACKey for Mac OS X Snow Leopard</title><organization>mil.army.usace</organization><userSees ui="both"/><min-target os="3"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="libcackey" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="mil.army.usace.cackeyForMacOsXSnowLeopard.libcackey.pkg"/></choice><choice title="libcackey_g" id="cackeydebug" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="mil.army.usace.cackeyForMacOsXSnowLeopard.libcackeyg.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+<pkmkdoc spec="1.12">
+	<properties>
+		<title>CACKey for Mac OS X Snow Leopard</title>
+		<organization>mil.army.usace</organization>
+		<userSees ui="both"/>
+		<min-target os="3"/>
+		<domain system="true"/>
+	</properties>
+	<distribution>
+		<versions min-spec="1.000000"/>
+		<scripts></scripts>
+	</distribution>
+	<contents>
+		<choice title="CACKey PKCS#11 Library (Core)" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false">
+			<pkgref id="mil.army.usace.cackeyForMacOsXSnowLeopard.libcackey.pkg"/>
+			<pkgref id="mil.army.usace.cackeyForMacOsXSnowLeopard.cackey.pkg"/>
+		</choice>
+		<choice title="CACKey PKCS#11 Library (Debug)" id="cackeydebug" starts_selected="true" starts_enabled="true" starts_hidden="false">
+			<pkgref id="mil.army.usace.cackeyForMacOsXSnowLeopard.libcackeyg.pkg"/>
+		</choice>
+	</contents>
+	<resources bg-scale="none" bg-align="topleft">
+		<locale lang="en">
+			<resource mime-type="text/rtf" kind="embedded" type="license">
+				<![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 Release information:\
     pkg: CACKey\
  author: US Army Corps of Engineers\
+Mac build contact: Kenneth Van Alstyne <kenneth.l.vanalstyne@usace.army.mil>\
+                   US Army Corps of Engineers\
+                   Information Technology Laboratory\
+                   Vicksburg, MS 39180\
 contact: Roy Keene <roy.s.keene@usace.army.mil>\
-         US Army Corps of Engineers\
-         Information Technology Laboratory\
-         Vicksburg, MS 39180\
 ------------------------------------------------\
 \
 The following files in the source directory are the intellectual property of the\
 Free Software Foundation and are licensed under the terms of the GNU General\
 Public License (GPL):\
@@ -26,15 +51,40 @@
 following licenses:\
 	mypkcs11.h : GNU General Public License 2.1.\
 	pkcs11.h   : GNU General Public License 2.1.\
 	pkcs11f.h  : GNU General Public License 2.1.\
 	pkcs11n.h  : Mozilla Public License or GNU General Public License\
-	pkcs11t.h  : GNU General Public License 2.1.}]]></resource><resource mime-type="text/rtf" kind="embedded" type="readme"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+	pkcs11t.h  : GNU General Public License 2.1.}]]>
+			</resource>
+			<resource mime-type="text/rtf" kind="embedded" type="readme">
+				<![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 Thank you for choosing to install CACKey.\
 \
-To use CACKey, install /Library/CACKey/libcackey.dylib as a security module into any application that can use a PKCS#11 provider.\
+To use CACKey, install /Library/CACKey/libcackey.dylib or\
+/usr/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
 \
-A debug version, libcackey_g.dylib is provided if debug output is necessary.}]]></resource></locale></resources><requirements><requirement id="tosv" operator="lt" value="'10.7'"><message>This CACKey release requires Mac OS X 10.6.</message></requirement><requirement id="tosv" operator="ge" value="'10.6'"><message>This CACKey release requires Mac OS X 10.6.</message></requirement></requirements><flags/><item type="file">01libcackey.xml</item><item type="file">02libcackey.xml</item><mod>properties.customizeOption</mod><mod>properties.userDomain</mod><mod>properties.title</mod><mod>properties.systemDomain</mod><mod>properties.anywhereDomain</mod></pkmkdoc>
+A debug version, /Library/CACKey/libcackey_g.dylib is provided if debug output is necessary.}]]>
+			</resource>
+		</locale>
+	</resources>
+	<requirements>
+		<requirement id="tosv" operator="lt" value="'10.7'">
+			<message>This CACKey release requires Mac OS X 10.6.</message>
+		</requirement>
+		<requirement id="tosv" operator="ge" value="'10.6'">
+			<message>This CACKey release requires Mac OS X 10.6.</message>
+		</requirement>
+	</requirements>
+	<flags/>
+	<item type="file">01libcackey.xml</item>
+	<item type="file">02libcackey.xml</item>
+	<item type="file">03libcackey.xml</item>
+	<mod>properties.customizeOption</mod>
+	<mod>properties.userDomain</mod>
+	<mod>properties.title</mod>
+	<mod>properties.systemDomain</mod>
+	<mod>properties.anywhereDomain</mod>
+</pkmkdoc>

Index: build/cackey_osx_build/Tiger_pmbuild.pmdoc/01libcackey.xml
==================================================================
--- build/cackey_osx_build/Tiger_pmbuild.pmdoc/01libcackey.xml
+++ build/cackey_osx_build/Tiger_pmbuild.pmdoc/01libcackey.xml
@@ -1,1 +1,29 @@
-<pkgref spec="1.12" uuid="0053AD09-FC44-4658-8239-DAE1C0CE3874"><config><identifier>mil.army.usace.cackeyForMacOsXTiger.libcackey.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../../macbuild/Tiger/libcackey.dylib</installFrom><installTo mod="true" relocatable="true">/Library/CACKey/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>relocatable</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>installTo</mod></config><contents><file-list>01libcackey-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="0053AD09-FC44-4658-8239-DAE1C0CE3874">
+	<config>
+		<identifier>mil.army.usace.cackeyForMacOsXTiger.libcackey.pkg</identifier>
+		<version>1</version>
+		<description></description>
+		<post-install type="none"/>
+		<requireAuthorization/>
+		<installFrom relative="true" mod="true">../../macbuild/Tiger/libcackey.dylib</installFrom>
+		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
+		<flags>
+			<followSymbolicLinks/>
+		</flags>
+		<packageStore type="internal"></packageStore>
+		<mod>parent</mod>
+		<mod>scripts.postinstall.path</mod>
+		<mod>relocatable</mod>
+		<mod>installTo.path</mod>
+		<mod>installFrom.path</mod>
+		<mod>installTo</mod>
+	</config>
+	<contents>
+		<file-list>01libcackey-contents.xml</file-list>
+		<filter>/CVS$</filter>
+		<filter>/\.svn$</filter>
+		<filter>/\.cvsignore$</filter>
+		<filter>/\.cvspass$</filter>
+		<filter>/\.DS_Store$</filter>
+	</contents>
+</pkgref>

Index: build/cackey_osx_build/Tiger_pmbuild.pmdoc/02libcackey.xml
==================================================================
--- build/cackey_osx_build/Tiger_pmbuild.pmdoc/02libcackey.xml
+++ build/cackey_osx_build/Tiger_pmbuild.pmdoc/02libcackey.xml
@@ -1,1 +1,29 @@
-<pkgref spec="1.12" uuid="FDF62936-7E3E-4AC3-8D34-3D1A41FE940D"><config><identifier>mil.army.usace.cackeyForMacOsXTiger.libcackeyg.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom relative="true" mod="true">../../macbuild/Tiger/libcackey_g.dylib</installFrom><installTo mod="true" relocatable="true">/Library/CACKey/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod><mod>scripts.postinstall.path</mod><mod>relocatable</mod><mod>installTo.path</mod><mod>installFrom.path</mod><mod>installTo</mod></config><contents><file-list>02libcackey-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
+<pkgref spec="1.12" uuid="FDF62936-7E3E-4AC3-8D34-3D1A41FE940D">
+	<config>
+		<identifier>mil.army.usace.cackeyForMacOsXTiger.libcackeyg.pkg</identifier>
+		<version>1</version>
+		<description></description>
+		<post-install type="none"/>
+		<requireAuthorization/>
+		<installFrom relative="true" mod="true">../../macbuild/Tiger/libcackey_g.dylib</installFrom>
+		<installTo mod="true" relocatable="true">/Library/CACKey/</installTo>
+		<flags>
+			<followSymbolicLinks/>
+		</flags>
+		<packageStore type="internal"></packageStore>
+		<mod>parent</mod>
+		<mod>scripts.postinstall.path</mod>
+		<mod>relocatable</mod>
+		<mod>installTo.path</mod>
+		<mod>installFrom.path</mod>
+		<mod>installTo</mod>
+	</config>
+	<contents>
+		<file-list>02libcackey-contents.xml</file-list>
+		<filter>/CVS$</filter>
+		<filter>/\.svn$</filter>
+		<filter>/\.cvsignore$</filter>
+		<filter>/\.cvspass$</filter>
+		<filter>/\.DS_Store$</filter>
+	</contents>
+</pkgref>

Index: build/cackey_osx_build/Tiger_pmbuild.pmdoc/index.xml
==================================================================
--- build/cackey_osx_build/Tiger_pmbuild.pmdoc/index.xml
+++ build/cackey_osx_build/Tiger_pmbuild.pmdoc/index.xml
@@ -1,17 +1,44 @@
-<pkmkdoc spec="1.12"><properties><title>CACKey for Mac OS X Tiger</title><build>/Users/kvanals/Desktop/cackey/release/cackey-0.5.15/macbuild/pkg/cackey_tiger.mpkg</build><organization>mil.army.usace</organization><userSees ui="both"/><min-target os="2"/><domain system="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><description>CACKey</description><contents><choice title="libcackey" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="mil.army.usace.cackeyForMacOsXTiger.libcackey.pkg"/></choice><choice title="libcackey_g" id="cackeydebug" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="mil.army.usace.cackeyForMacOsXTiger.libcackeyg.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+<pkmkdoc spec="1.12">
+	<properties>
+		<title>CACKey for Mac OS X Tiger</title>
+		<build>/Users/kvanals/Desktop/cackey/release/cackey-0.5.15/macbuild/pkg/cackey_tiger.mpkg</build>
+		<organization>mil.army.usace</organization>
+		<userSees ui="both"/>
+		<min-target os="2"/>
+		<domain system="true"/>
+	</properties>
+	<distribution>
+		<versions min-spec="1.000000"/>
+		<scripts></scripts>
+	</distribution>
+	<description>CACKey</description>
+	<contents>
+		<choice title="CACKey PKCS#11 Library (Core)" id="cackey" starts_selected="true" starts_enabled="true" starts_hidden="false">
+			<pkgref id="mil.army.usace.cackeyForMacOsXTiger.libcackey.pkg"/>
+			<pkgref id="mil.army.usace.cackeyForMacOsXTiger.cackey.pkg"/>
+		</choice>
+		<choice title="CACKey PKCS#11 Library (Debug)" id="cackeydebug" starts_selected="true" starts_enabled="true" starts_hidden="false">
+			<pkgref id="mil.army.usace.cackeyForMacOsXTiger.libcackeyg.pkg"/>
+		</choice>
+	</contents>
+	<resources bg-scale="none" bg-align="topleft">
+		<locale lang="en">
+			<resource mime-type="text/rtf" kind="embedded" type="license">
+				<![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 Release information:\
     pkg: CACKey\
  author: US Army Corps of Engineers\
+Mac build contact: Kenneth Van Alstyne <kenneth.l.vanalstyne@usace.army.mil>\
+                   US Army Corps of Engineers\
+                   Information Technology Laboratory\
+                   Vicksburg, MS 39180\
 contact: Roy Keene <roy.s.keene@usace.army.mil>\
-         US Army Corps of Engineers\
-         Information Technology Laboratory\
-         Vicksburg, MS 39180\
 ------------------------------------------------\
 \
 The following files in the source directory are the intellectual property of the\
 Free Software Foundation and are licensed under the terms of the GNU General\
 Public License (GPL):\
@@ -26,15 +53,40 @@
 following licenses:\
 	mypkcs11.h : GNU General Public License 2.1.\
 	pkcs11.h   : GNU General Public License 2.1.\
 	pkcs11f.h  : GNU General Public License 2.1.\
 	pkcs11n.h  : Mozilla Public License or GNU General Public License\
-	pkcs11t.h  : GNU General Public License 2.1.}]]></resource><resource mime-type="text/rtf" kind="embedded" type="readme"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
+	pkcs11t.h  : GNU General Public License 2.1.}]]>
+			</resource>
+			<resource mime-type="text/rtf" kind="embedded" type="readme">
+				<![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
 {\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
 
 \f0\fs26 \cf0 Thank you for choosing to install CACKey.\
 \
-To use CACKey, install /Library/CACKey/libcackey.dylib as a security module into any application that can use a PKCS#11 provider.\
+To use CACKey, install /Library/CACKey/libcackey.dylib or\
+/usr/lib/pkcs11/cackey.dylib as a security module into any application that can use a PKCS#11 provider.\
 \
-A debug version, libcackey_g.dylib is provided if debug output is necessary.}]]></resource></locale></resources><requirements><requirement id="tosv" operator="lt" value="'10.5'"><message>This CACKey release requires Mac OS X 10.4.</message></requirement><requirement id="tosv" operator="ge" value="'10.4'"><message>This CACKey release requires Mac OS X 10.4.</message></requirement></requirements><flags/><item type="file">01libcackey.xml</item><item type="file">02libcackey.xml</item><mod>properties.customizeOption</mod><mod>properties.title</mod><mod>description</mod><mod>properties.systemDomain</mod><mod>properties.anywhereDomain</mod></pkmkdoc>
+A debug version, /Library/CACKey/libcackey_g.dylib is provided if debug output is necessary.}]]>
+			</resource>
+		</locale>
+	</resources>
+	<requirements>
+		<requirement id="tosv" operator="lt" value="'10.5'">
+			<message>This CACKey release requires Mac OS X 10.4.</message>
+		</requirement>
+		<requirement id="tosv" operator="ge" value="'10.4'">
+			<message>This CACKey release requires Mac OS X 10.4.</message>
+		</requirement>
+	</requirements>
+	<flags/>
+	<item type="file">01libcackey.xml</item>
+	<item type="file">02libcackey.xml</item>
+	<item type="file">03libcackey.xml</item>
+	<mod>properties.customizeOption</mod>
+	<mod>properties.title</mod>
+	<mod>description</mod>
+	<mod>properties.systemDomain</mod>
+	<mod>properties.anywhereDomain</mod>
+</pkmkdoc>

Index: build/cackey_osx_build/build_osx.sh
==================================================================
--- build/cackey_osx_build/build_osx.sh
+++ build/cackey_osx_build/build_osx.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 # Shell Script to make Mac OS X Releases of CACKey
 # Kenneth Van Alstyne
 # kenneth.l.vanalstyne@usace.army.mil
 # 20100712
+CACKEY_VERSION=`cat configure.ac | grep AC_INIT | cut -d " " -f 2 | sed 's_)__'`
 
 # Usage function
 usage() {
 	echo "Usage: build_osx.sh <target>"
 	echo Where target is one of:
@@ -18,10 +19,15 @@
 	exit $?
 }
 
 # Clean up function
 clean() {
+	for PMDOC in build/cackey_osx_build/*_pmbuild.pmdoc/*.in; do
+		PMDOC="`echo "${PMDOC}" | sed 's_.in__g'`"
+		rm -f "${PMDOC}"
+	done
+	rm -f build/cackey_osx_build/cackey.dylib
 	rm -rf macbuild
 	make distclean
 }
 
 # Directory creation function
@@ -142,19 +148,26 @@
 	rm macbuild/${OSX}/libcackey*.dylib.*
 }
 
 # Function to build Mac OS X Packages
 pkgbuild() {
+	rm -f build/cackey_osx_build/cackey.dylib
+	ln macbuild/${OSX}/libcackey.dylib build/cackey_osx_build/cackey.dylib
+	for PMDOC in build/cackey_osx_build/${OSX}_pmbuild.pmdoc/*.in; do
+		PMDOC="`echo "${PMDOC}" | sed 's_.in__g'`"
+		sed "s|@@BUILDROOTDIR@@|$(pwd)|g" ${PMDOC}.in > ${PMDOC}
+	done
 	if [ ${OSX} == "Panther" ]; then
 		EXT=mpkg
 	else
 		EXT=pkg
 	fi
-	/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -d build/cackey_osx_build/${OSX}_pmbuild.pmdoc -o macbuild/pkg/CACKey_${OSX}.${EXT}
-	tar --create --directory macbuild/pkg/ --file macbuild/pkg/CACKey_${OSX}.${EXT}.tar CACKey_${OSX}.${EXT}
-	gzip -9 macbuild/pkg/CACKey_${OSX}.${EXT}.tar
-	rm -rf macbuild/pkg/CACKey_${OSX}.${EXT}
+	/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
+	rm -rf macbuild/pkg/CACKey_${CACKEY_VERSION}_${OSX}.${EXT}
+	rm -f build/cackey_osx_build/cackey.dylib
 	echo "${OSX} build complete"
 }
 
 # Take command line arguments and execute
 case "$1" in