diff --git a/.gitignore b/.gitignore
index 60080e52..425c3401 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,8 +79,10 @@ src/tools/opensc-explorer
 src/tools/cardos-info
 src/tools/sceac-example
 src/tools/opensc-notify
+src/tools/opensc-notify.plist
 src/tools/org.opensc.notify.desktop
 src/tools/pkcs11-register
+src/tools/pkcs11-register.plist
 src/tools/pkcs11-register.desktop
 src/tools/opensc-asn1
 
diff --git a/MacOSX/build-package.in b/MacOSX/build-package.in
index 48f4a25a..c3ee2917 100755
--- a/MacOSX/build-package.in
+++ b/MacOSX/build-package.in
@@ -125,6 +125,7 @@ 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
 
 # Build package
 pkgbuild --root ${BUILDPATH}/target --scripts MacOSX/scripts --identifier org.opensc-project.mac --version @PACKAGE_VERSION@ --install-location / OpenSC.pkg
diff --git a/MacOSX/scripts/postinstall b/MacOSX/scripts/postinstall
index fed5aa86..17a09f31 100755
--- a/MacOSX/scripts/postinstall
+++ b/MacOSX/scripts/postinstall
@@ -15,8 +15,18 @@ else
 	mv /Library/OpenSC/etc/opensc.conf.orig /Library/OpenSC/etc/opensc.conf
 	md5 -r /Library/OpenSC/etc/opensc.conf  > /Library/OpenSC/etc/opensc.conf.md5
 fi
+
 for f in /Library/OpenSC/bin/*
 do
 	ln -sf $f /usr/local/bin
 done
+
+for f in /Library/LaunchAgents/pkcs11-register.plist /Library/LaunchAgents/pkcs11-register.plist
+do
+	if [ -e "$f" ]
+	then
+		/bin/launchctl asuser $(id -u "${USER}") /bin/launchctl load "$f"
+	fi
+done
+
 exit 0
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index 13865c9c..fb97c57a 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
+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
 
 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
+noinst_DATA = pkcs11-register.plist opensc-notify.plist
 
 %.plist: %.plist.in
 	$(do_subst) < $< > $@
diff --git a/src/tools/opensc-notify.plist.in b/src/tools/opensc-notify.plist.in
new file mode 100644
index 00000000..3f48dd10
--- /dev/null
+++ b/src/tools/opensc-notify.plist.in
@@ -0,0 +1,14 @@
+<?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@/opensc-notify</string>
+    </array>
+    <key>RunAtLoad</key>
+    <true/>
+</dict>
+</plist>
diff --git a/win32/OpenSC.wxs.in b/win32/OpenSC.wxs.in
index 7cbda4c1..9db50a85 100644
--- a/win32/OpenSC.wxs.in
+++ b/win32/OpenSC.wxs.in
@@ -205,11 +205,21 @@
                   <File Source="$(var.SOURCE_DIR)\src\tools\npa-tool.exe" Vital="yes"/>
                 </Component>
               <?endif ?>
-              <Component Id="Autostart_tools" Guid="*">
+              <Component Id="Autostart_tools" Guid="*" Win64="$(var.Win64YesNo)">
                 <RegistryKey Root="HKMU" Key="Software\Microsoft\Windows\CurrentVersion\Run" Action="createAndRemoveOnUninstall">
                   <RegistryValue Type="string" Name="pkcs11-register.exe" Value="[INSTALLDIR_TOOLS]pkcs11-register.exe" />
                 </RegistryKey>
               </Component>
+              <Component Id="Autostart_native_tools" Guid="*" Win64="$(var.Win64YesNo)">
+                <?if $(var.Platform) = "x86"?>
+                <Condition>
+                  <![CDATA[NOT Msix64]]>
+                </Condition>
+                <?endif?>
+                <RegistryKey Root="HKMU" Key="Software\Microsoft\Windows\CurrentVersion\Run" Action="createAndRemoveOnUninstall">
+                  <RegistryValue Type="string" Name="opensc-notify.exe" Value="[INSTALLDIR_TOOLS]opensc-notify.exe" />
+                </RegistryKey>
+              </Component>
             </Directory>
             <?ifdef OpenSSL ?>
               <Directory Id="INSTALLDIR_PROFILES" Name="profiles">
@@ -431,8 +441,9 @@
       <Feature Id="OpenSC_menu" Level="1" Title="Start menu entries" Description="Start menu entries: link to documentation">
         <ComponentRef Id="ProgramMenuDir"/>
       </Feature>
-      <Feature Id="OpenSC_autostart" Level="1" Title="Autostart entries" Description="Run pkcs11-register.exe after login">
+      <Feature Id="OpenSC_autostart" Level="1" Title="Autostart entries" Description="Run pkcs11-register.exe and opensc-notify.exe after login">
         <ComponentRef Id="Autostart_tools"/>
+        <ComponentRef Id="Autostart_native_tools"/>
       </Feature>
     </Feature>
     <UI Id='Mondo'>