diff --git a/MacOSX/build-package.in b/MacOSX/build-package.in
index ed6125d1..44e5f202 100755
--- a/MacOSX/build-package.in
+++ b/MacOSX/build-package.in
@@ -144,8 +144,8 @@ cp MacOSX/opensc-uninstall ${BUILDPATH}/target/usr/local/bin
 
 # Prepare startup root
 mkdir -p ${BUILDPATH}/target_startup/Library/LaunchAgents
-cp src/tools/pkcs11-register.plist ${BUILDPATH}/target_startup/Library/LaunchAgents
-cp src/tools/opensc-notify.plist ${BUILDPATH}/target_startup/Library/LaunchAgents
+cp src/tools/org.opensc-project.mac.pkcs11-register.plist ${BUILDPATH}/target_startup/Library/LaunchAgents
+cp src/tools/org.opensc-project.mac.opensc-notify.plist   ${BUILDPATH}/target_startup/Library/LaunchAgents
 
 # Build OpenSCToken if possible
 if test -e OpenSCToken -a -n "${CODE_SIGN_IDENTITY}" -a -n "${DEVELOPMENT_TEAM}"; then
diff --git a/MacOSX/scripts/postinstall b/MacOSX/scripts/postinstall
index 76a14a3f..fc6524d6 100755
--- a/MacOSX/scripts/postinstall
+++ b/MacOSX/scripts/postinstall
@@ -53,8 +53,8 @@ done
 
 # register the launch agents
 for f in \
-  /Library/LaunchAgents/pkcs11-register.plist \
-  /Library/LaunchAgents/opensc-notify.plist
+  /Library/LaunchAgents/org.opensc-project.mac.pkcs11-register.plist \
+  /Library/LaunchAgents/org.opensc-project.mac.opensc-notify.plist
 do
   [ -e "$f" ] || continue
   /bin/launchctl asuser "$(id -u "$USER")" /bin/launchctl load "$f" || true
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 4915ab90..1d4363c5 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -21,7 +21,7 @@ do_subst = $(SED) \
 	   -e 's,[@]X509DIR[@],$(X509DIR),g'
 
 MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/versioninfo-tools.rc $(srcdir)/versioninfo-opensc-notify.rc
-EXTRA_DIST = Makefile.mak versioninfo-tools.rc.in versioninfo-opensc-notify.rc.in goid-tool.ggo.in npa-tool.ggo.in opensc-notify.ggo.in egk-tool.ggo.in opensc-asn1.ggo.in org.opensc.notify.desktop.in exe.manifest pkcs11-register.desktop.in pkcs11-register.plist.in opensc-notify.plist.in
+EXTRA_DIST = Makefile.mak versioninfo-tools.rc.in versioninfo-opensc-notify.rc.in goid-tool.ggo.in npa-tool.ggo.in opensc-notify.ggo.in egk-tool.ggo.in opensc-asn1.ggo.in org.opensc.notify.desktop.in exe.manifest pkcs11-register.desktop.in org.opensc-project.mac.pkcs11-register.plist.in org.opensc-project.mac.opensc-notify.plist.in
 
 noinst_HEADERS = util.h fread_to_eof.h \
 	egk-tool-cmdline.h goid-tool-cmdline.h npa-tool-cmdline.h \
@@ -175,7 +175,7 @@ endif
 %.desktop: %.desktop.in
 	$(do_subst) < $< > $@
 
-noinst_DATA = pkcs11-register.plist opensc-notify.plist
+noinst_DATA = org.opensc-project.mac.pkcs11-register.plist org.opensc-project.mac.opensc-notify.plist
 
 %.plist: %.plist.in
 	$(do_subst) < $< > $@
diff --git a/src/tools/opensc-notify.plist.in b/src/tools/opensc-notify.plist.in
deleted file mode 100644
index 40260478..00000000
--- a/src/tools/opensc-notify.plist.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>Label</key>
-    <string>opensc-notify</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>@bindir@/opensc-notify</string>
-    </array>
-    <key>RunAtLoad</key>
-    <true/>
-</dict>
-</plist>
diff --git a/src/tools/org.opensc-project.mac.opensc-notify.plist.in b/src/tools/org.opensc-project.mac.opensc-notify.plist.in
new file mode 100644
index 00000000..8f45fb25
--- /dev/null
+++ b/src/tools/org.opensc-project.mac.opensc-notify.plist.in
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>Label</key>
+        <string>org.opensc-project.mac.opensc-notify</string>
+        <key>Program</key>
+        <string>@bindir@/opensc-notify</string>
+        <key>RunAtLoad</key>
+        <true/>
+        <key>StandardErrorPath</key>
+        <string>/dev/null</string>
+        <key>StandardOutPath</key>
+        <string>/dev/null</string>
+    </dict>
+</plist>
diff --git a/src/tools/org.opensc-project.mac.pkcs11-register.plist.in b/src/tools/org.opensc-project.mac.pkcs11-register.plist.in
new file mode 100644
index 00000000..cf6cc471
--- /dev/null
+++ b/src/tools/org.opensc-project.mac.pkcs11-register.plist.in
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+    <dict>
+        <key>Label</key>
+        <string>org.opensc-project.mac.pkcs11-register</string>
+        <key>Program</key>
+        <string>@bindir@/pkcs11-register</string>
+        <key>RunAtLoad</key>
+        <true/>
+        <key>StandardErrorPath</key>
+        <string>/dev/null</string>
+        <key>StandardOutPath</key>
+        <string>/dev/null</string>
+    </dict>
+</plist>
diff --git a/src/tools/pkcs11-register.plist.in b/src/tools/pkcs11-register.plist.in
deleted file mode 100644
index 1582ee56..00000000
--- a/src/tools/pkcs11-register.plist.in
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>Label</key>
-    <string>pkcs11-register</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>@bindir@/pkcs11-register</string>
-    </array>
-    <key>RunAtLoad</key>
-    <true/>
-</dict>
-</plist>