diff --git a/MacOSX/build-package.in b/MacOSX/build-package.in
index 0fe0b66a..0b60ecb4 100755
--- a/MacOSX/build-package.in
+++ b/MacOSX/build-package.in
@@ -130,8 +130,8 @@ else
 		git clone http://github.com/frankmorgner/OpenSCToken.git
 	fi
 
-	# Build and copy OpenSCToken
-	xcodebuild -target OpenSCToken -configuration Deployment -project OpenSCToken/OpenSCTokenApp.xcodeproj install DSTROOT=${BUILDPATH}/target
+	# Build and copy OpenSCTokenApp
+	xcodebuild -target OpenSCTokenApp -configuration Release -project OpenSCToken/OpenSCTokenApp.xcodeproj install DSTROOT=${BUILDPATH}/target
 
 	#codesign --sign "$SIGNING_IDENTITY" --force --entitlements OpenSCToken/OpenSCToken/opensctoken.entitlements target/Library/OpenSC/bin/*
 	#codesign --sign "$SIGNING_IDENTITY" --force --entitlements OpenSCToken/OpenSCToken/opensctoken.entitlements target/Library/OpenSC/lib/*.dylib
diff --git a/MacOSX/opensc-uninstall b/MacOSX/opensc-uninstall
index e34368da..1a71161a 100755
--- a/MacOSX/opensc-uninstall
+++ b/MacOSX/opensc-uninstall
@@ -20,7 +20,11 @@ rm -rf "/Applications/OpenSC Notify.app"
 rm -rf /Library/OpenSC
 rm -rf /Library/Security/tokend/OpenSC.tokend
 rm -rf /System/Library/Security/tokend/OpenSC.tokend
-rm -rf /System/Library/Frameworks/CryptoTokenKit.framework/PlugIns/OpenSCToken.appex
+
+if [ -e "/Library/OpenSC/OpenSCTokenApp.app/Contents/PlugIns/OpenSCToken.appex" ]
+then
+	pluginkit -r /Library/OpenSC/OpenSCTokenApp.app/Contents/PlugIns/OpenSCToken.appex
+fi
 
 # delete receipts on 10.6+
 for file in /var/db/receipts/org.opensc-project.mac.bom /var/db/receipts/org.opensc-project.mac.plist; do
diff --git a/MacOSX/scripts/postinstall b/MacOSX/scripts/postinstall
index fed5aa86..27ba2a4b 100755
--- a/MacOSX/scripts/postinstall
+++ b/MacOSX/scripts/postinstall
@@ -19,4 +19,8 @@ for f in /Library/OpenSC/bin/*
 do
 	ln -sf $f /usr/local/bin
 done
+if [ -e "/Library/OpenSC/OpenSCTokenApp.app/Contents/PlugIns/OpenSCToken.appex" ]
+then
+	pluginkit -a /Library/OpenSC/OpenSCTokenApp.app/Contents/PlugIns/OpenSCToken.appex
+fi
 exit 0