diff --git a/MacOSX/build-package.in b/MacOSX/build-package.in
index 5cfb23bf..86b7177c 100755
--- a/MacOSX/build-package.in
+++ b/MacOSX/build-package.in
@@ -87,6 +87,15 @@ if ! test -e ${BUILDPATH}/target/$PREFIX/lib/pkgconfig; then
 	./MacOSX/libtool-bundle ${BUILDPATH}/target/$PREFIX/lib/opensc-pkcs11.so ${BUILDPATH}/target/$PREFIX/lib
 fi
 
+
+if ! test -e NotificationProxy; then
+	git clone http://github.com/frankmorgner/NotificationProxy.git
+fi
+xcodebuild -target NotificationProxy -configuration Release -project NotificationProxy/NotificationProxy.xcodeproj install DSTROOT=$BUILDPATH/target/Library/OpenSC/
+mkdir -p "$BUILDPATH/target/Applications"
+osacompile -o "$BUILDPATH/target/Applications/OpenSC Notify.app" "MacOSX/OpenSC_Notify.applescript"
+
+
 # Check out OpenSC.tokend, if not already fetched.
 if ! test -e OpenSC.tokend; then
 	git clone http://github.com/OpenSC/OpenSC.tokend.git
@@ -114,13 +123,6 @@ fi
 	#cp -r terminal-notifier-1.7.1/terminal-notifier.app $BUILDPATH/target/Library/Security/tokend/OpenSC.tokend/Contents/Resources/Applications
 #fi
 
-if ! test -e NotificationProxy; then
-	git clone http://github.com/frankmorgner/NotificationProxy.git
-fi
-xcodebuild -target NotificationProxy -configuration Release -project NotificationProxy/NotificationProxy.xcodeproj install DSTROOT=$BUILDPATH/target_tokend/Library/Security/tokend/OpenSC.tokend/Contents/Resources/
-mkdir -p "$BUILDPATH/target/Applications"
-osacompile -o "$BUILDPATH/target/Applications/OpenSC Notify.app" "MacOSX/OpenSC_Notify.applescript"
-
 imagedir=$(mktemp -d)
 
 # Prepare target root
@@ -156,7 +158,6 @@ if test -e OpenSCToken; then
 	BUILDPATH=${BP}
 	xcodebuild -target OpenSCTokenApp -configuration Debug -project OpenSCTokenApp.xcodeproj install DSTROOT=${BUILDPATH}/target_token
 	cd ..
-	xcodebuild -target NotificationProxy -configuration Release -project NotificationProxy/NotificationProxy.xcodeproj install DSTROOT=$BUILDPATH/target_token/Applications/OpenSCTokenApp.app/Contents/Resources/
 else
 	# if no OpenSCToken is checked out, then we create a dummy package
 	mkdir -p ${BUILDPATH}/target_token
diff --git a/src/ui/notify.c b/src/ui/notify.c
index 36219c25..90e7778c 100644
--- a/src/ui/notify.c
+++ b/src/ui/notify.c
@@ -328,7 +328,7 @@ static void notify_proxy(struct sc_context *ctx,
 	 * the notification
 	 * (https://github.com/julienXX/terminal-notifier/issues/196), that's why
 	 * we're including NotificationProxy which has similar features */
-	const char notificationproxy[] = "/Library/Security/tokend/OpenSC.tokend/Contents/Resources/Applications/NotificationProxy.app/Contents/MacOS/NotificationProxy";
+	const char notificationproxy[] = "/Library/OpenSC/Applications/NotificationProxy.app/Contents/MacOS/NotificationProxy";
 
 	if (ctx && ctx->app_name
 			&& (0 == strcmp(ctx->app_name, "opensc-pkcs11")