diff --git a/Makefile.mak b/Makefile.mak
index f76f33e6..9489a5cc 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -2,5 +2,19 @@ SUBDIRS = etc win32 src
 
 default: all
 
+32:
+	CALL "C:\Program Files\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86
+	$(MAKE) /f Makefile.mak opensc.msi PLATFORM=x86 OPENPACE_DIR=C:\openpace-Win32_1.0.2
+	MOVE win32\OpenSC.msi OpenSC_win32.msi
+
+64:
+	CALL "C:\Program Files\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64
+	$(MAKE) /f Makefile.mak opensc.msi OPENPACE_DIR=C:\openpace-Win64_1.0.2
+	MOVE win32\OpenSC.msi OpenSC_win64.msi
+
+opensc.msi:
+	$(MAKE) /f Makefile.mak all OPENSSL_DEF=/DENABLE_OPENSSL OPENPACE_DEF=/DENABLE_OPENPACE"
+	@cmd /c "cd win32 && $(MAKE) /nologo /f Makefile.mak opensc.msi OPENSSL_DEF=/DENABLE_OPENSSL OPENPACE_DEF=/DENABLE_OPENPACE"
+
 all clean::
 	@for %i in ( $(SUBDIRS) ) do @cmd /c "cd %i && $(MAKE) /nologo /f Makefile.mak $@"
diff --git a/win32/OpenSC.wxs.in b/win32/OpenSC.wxs.in
index 82d470de..09ab5336 100644
--- a/win32/OpenSC.wxs.in
+++ b/win32/OpenSC.wxs.in
@@ -365,7 +365,7 @@
           <ComponentRef Id="DESCHSMCVCA00001"/>
         <?endif ?>
       </Feature>
-      <Feature Id="OpenSC_pkcs11" Level="1" Title="PKCS#11 module" Description="Security module that can be used by most cross-platform software, for example Firefox, Thunderbird, OpenVPN, etc." TypicalDefault="install">
+      <Feature Id="OpenSC_pkcs11" Level="1" Title="PKCS#11 module" Description="Security module that can be used by most cross-platform software, for example Firefox, Thunderbird, OpenVPN, etc.">
         <ComponentRef Id="opensc_pkcs11.dll"/>
         <ComponentRef Id="onepin_opensc_pkcs11.dll"/>
       </Feature>
@@ -436,14 +436,14 @@
           <ComponentRef Id="isoApplet.profile"/>
           <ComponentRef Id="gids.profile"/>
         <?endif ?>
+        <Feature Id="OpenSC_autostart" Level="1" Title="Autostart entries" Description="After login, automatically register the PKCS#11 module and start smart card notifications.">
+          <ComponentRef Id="Autostart_tools"/>
+          <ComponentRef Id="Autostart_native_tools"/>
+        </Feature>
       </Feature>
       <Feature Id="OpenSC_menu" Level="1" Title="Start menu entries" Description="Add documentation links to the start menu.">
         <ComponentRef Id="ProgramMenuDir"/>
       </Feature>
-      <Feature Id="OpenSC_autostart" Level="1" Title="Autostart entries" Description="After login, automatically register the PKCS#11 module and start smart card notifications.">
-        <ComponentRef Id="Autostart_tools"/>
-        <ComponentRef Id="Autostart_native_tools"/>
-      </Feature>
     </Feature>
     <UI Id='Mondo'>
       <UIRef Id="WixUI_Mondo"/>