Index: /trunk/src/VBox/Installer/win/PublicProperties.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/PublicProperties.wxi	(revision 58720)
+++ /trunk/src/VBox/Installer/win/PublicProperties.wxi	(revision 58721)
@@ -20,10 +20,4 @@
      case we're building the installer as MSM modules -->
 
-<!-- Default property for network adapter type -->
-<Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes"/>
-
-<!-- Force NDIS5 on pre-Vista -->
-<SetProperty Id="NETWORKTYPE" After="CostFinalize" Value="NDIS5"><![CDATA[(NETWORKTYPE="NDIS6") AND (VersionNT < 600)]]></SetProperty>
-
   <!-- Whether or not a desktop shortcut should be created. -->
   <Property Id="VBOX_INSTALLDESKTOPSHORTCUT" Value="1" Secure="yes"/>
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxi	(revision 58720)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxi	(revision 58721)
@@ -25,5 +25,11 @@
               Source="$(env.PATH_OUT)\bin\VBoxNetAdp.cat" />
 <?endif ?>
-        <Condition><![CDATA[NETWORKTYPE="NDIS5"]]></Condition>
+
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+        <Condition><![CDATA[(localMSMNetworkType="NDIS5")]]></Condition>
+<?else ?>
+        <Condition><![CDATA[(NETWORKTYPE="NDIS5")]]></Condition>
+<?endif ?>
+
     </Component>
 
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs	(revision 58720)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetAdp.wxs	(revision 58721)
@@ -34,5 +34,14 @@
                  SummaryCodepage="1252"/>
 
+
         <?include PublicProperties.wxi ?>
+
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+        <Property Id="localMSMNetworkType" Value="Empty" /> 
+        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/> 
+        <Substitution Table="CustomAction" Row="setNetworkTypeADP" Column="Target" Value="[=passedNetworkType]"/> 
+        <CustomAction Id="setNetworkTypeADP" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" /> 
+        <CustomAction Id="correctNetworkTypeADP" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
+<?endif ?>
 
         <!-- Here comes the file/directory list -->
@@ -48,6 +57,12 @@
         <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
         <?include VBoxMergeNetAdpCA.wxi ?>
-
+        
         <InstallExecuteSequence>
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <Custom Action="setNetworkTypeADP" After="CostInitialize"/>
+            <Custom Action="correctNetworkTypeADP" After="setNetworkTypeADP">
+                <![CDATA[(VersionNT < 600)]]>
+            </Custom>
+<?endif ?>
             <?include VBoxMergeNetAdpSeq.wxi ?>
         </InstallExecuteSequence>
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxi	(revision 58720)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxi	(revision 58721)
@@ -25,7 +25,11 @@
               Source="$(env.PATH_OUT)\bin\VBoxNetAdp6.cat" />
 <?endif ?>
-<?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
-        <Condition><![CDATA[NETWORKTYPE="NDIS6"]]></Condition>
+
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+        <Condition><![CDATA[(localMSMNetworkType="NDIS6")]]></Condition>
+<?else ?>
+        <Condition><![CDATA[(NETWORKTYPE="NDIS6")]]></Condition>
 <?endif ?>
+
     </Component>
 
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs	(revision 58720)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetAdp6.wxs	(revision 58721)
@@ -34,5 +34,14 @@
                  SummaryCodepage="1252"/>
 
+
         <?include PublicProperties.wxi ?>
+
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+        <Property Id="localMSMNetworkType" Value="NDIS6" /> 
+        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/> 
+        <Substitution Table="CustomAction" Row="setNetworkTypeADP6" Column="Target" Value="[=passedNetworkType]"/> 
+        <CustomAction Id="setNetworkTypeADP6" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" /> 
+        <CustomAction Id="correctNetworkTypeADP6" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
+<?endif ?>
 
         <!-- Here comes the file/directory list -->
@@ -50,4 +59,10 @@
 
         <InstallExecuteSequence>
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <Custom Action="setNetworkTypeADP6" After="CostInitialize"/>
+            <Custom Action="correctNetworkTypeADP6" After="setNetworkTypeADP6">
+                <![CDATA[(VersionNT < 600)]]>
+            </Custom>
+<?endif ?>
             <?include VBoxMergeNetAdp6Seq.wxi ?>
         </InstallExecuteSequence>
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxi	(revision 58720)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxi	(revision 58721)
@@ -30,5 +30,11 @@
               Source="$(env.PATH_OUT)\bin\VBoxNetFlt.cat" />
 <?endif ?>
-        <Condition><![CDATA[NETWORKTYPE="NDIS5"]]></Condition>
+
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+        <Condition><![CDATA[(localMSMNetworkType="NDIS5")]]></Condition>
+<?else ?>
+        <Condition><![CDATA[(NETWORKTYPE="NDIS5")]]></Condition>
+<?endif ?>
+
     </Component>
 
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxs	(revision 58720)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetFlt.wxs	(revision 58721)
@@ -34,5 +34,14 @@
                  SummaryCodepage="1252"/>
 
-        <?include PublicProperties.wxi ?>                 
+
+        <?include PublicProperties.wxi ?>
+
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+        <Property Id="localMSMNetworkType" Value="Empty" /> 
+        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/> 
+        <Substitution Table="CustomAction" Row="setNetworkTypeFLT" Column="Target" Value="[=passedNetworkType]"/> 
+        <CustomAction Id="setNetworkTypeFLT" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" /> 
+        <CustomAction Id="correctNetworkTypeFLT" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
+<?endif ?>
 
         <!-- Here comes the file/directory list -->
@@ -50,4 +59,10 @@
 
         <InstallExecuteSequence>
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <Custom Action="setNetworkTypeFLT" After="CostInitialize"/>
+            <Custom Action="correctNetworkTypeFLT" After="setNetworkTypeFLT">
+                <![CDATA[(VersionNT < 600)]]>
+            </Custom>
+<?endif ?>
             <?include VBoxMergeNetFltSeq.wxi ?>
         </InstallExecuteSequence>
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxi
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxi	(revision 58720)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxi	(revision 58721)
@@ -26,7 +26,11 @@
               Source="$(env.PATH_OUT)\bin\VBoxNetLwf.cat" />
 <?endif ?>
-<?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
-        <Condition><![CDATA[NETWORKTYPE="NDIS6"]]></Condition>
+
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+        <Condition><![CDATA[(localMSMNetworkType="NDIS6")]]></Condition>
+<?else ?>
+        <Condition><![CDATA[(NETWORKTYPE="NDIS6")]]></Condition>
 <?endif ?>
+
     </Component>
 
Index: /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs	(revision 58720)
+++ /trunk/src/VBox/Installer/win/VBoxMergeNetLwf.wxs	(revision 58721)
@@ -34,5 +34,14 @@
                  SummaryCodepage="1252"/>
 
+
         <?include PublicProperties.wxi ?>
+
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+        <Property Id="localMSMNetworkType" Value="NDIS6" /> 
+        <Configuration Name="passedNetworkType" Format="Text" DefaultValue="Not passed"/> 
+        <Substitution Table="CustomAction" Row="setNetworkTypeLWF" Column="Target" Value="[=passedNetworkType]"/> 
+        <CustomAction Id="setNetworkTypeLWF" Property="localMSMNetworkType" Value="[localMSMNetworkType]" Execute="immediate" /> 
+        <CustomAction Id="correctNetworkTypeLWF" Property="localMSMNetworkType" Value="NDIS5" Execute="immediate" />
+<?endif ?>
 
         <!-- Here comes the file/directory list -->
@@ -50,4 +59,10 @@
 
         <InstallExecuteSequence>
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
+            <Custom Action="setNetworkTypeLWF" After="CostInitialize"/>
+            <Custom Action="correctNetworkTypeLWF" After="setNetworkTypeLWF">
+                <![CDATA[(VersionNT < 600)]]>
+            </Custom>
+<?endif ?>
             <?include VBoxMergeNetLwfSeq.wxi ?>
         </InstallExecuteSequence>
Index: /trunk/src/VBox/Installer/win/VirtualBox.wxs
===================================================================
--- /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58720)
+++ /trunk/src/VBox/Installer/win/VirtualBox.wxs	(revision 58721)
@@ -61,4 +61,11 @@
     <Property Id="ARPURLINFOABOUT">http://www.virtualbox.org</Property>
     <Property Id="ARPURLUPDATEINFO">http://www.virtualbox.org</Property>
+    
+    <Property Id="NETWORKTYPE" Value="NDIS6" Secure="yes"/>
+
+<?if $(env.VBOX_WITH_MSM_INSTALL) = "no" ?>
+    <!-- Force NDIS5 on pre-Vista -->
+    <SetProperty Id="NETWORKTYPE" After="CostFinalize" Value="NDIS5"><![CDATA[(VersionNT < 600)]]></SetProperty>
+<?endif ?>
 
     <!-- Install the product for all users on the system -->
@@ -241,5 +248,7 @@
                         <Directory Id="dir_NetFlt" Name="netflt">
     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-                            <Merge Id="msm_VBoxNetworkFlt" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkFlt)" DiskId="1" />
+                            <Merge Id="msm_VBoxNetworkFlt" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkFlt)" DiskId="1">
+                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/> 
+                            </Merge>
     <?else ?>
                             <Directory Id="msm_VBoxNetworkFltFolder" FileSource=".">
@@ -251,5 +260,7 @@
                         <Directory Id="dir_NetAdp" Name="netadp">
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-                            <Merge Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp)" DiskId="1" />
+                            <Merge Id="msm_VBoxNetworkAdp" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp)" DiskId="1">
+                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/> 
+                            </Merge>
 <?else ?>
                             <Directory Id="msm_VBoxNetworkAdpFolder" FileSource=".">
@@ -262,5 +273,7 @@
                         <Directory Id="dir_NetLwf" Name="netlwf">
     <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-                            <Merge Id="msm_VBoxNetworkLwf" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkLwf)" DiskId="1" />
+                            <Merge Id="msm_VBoxNetworkLwf" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkLwf)" DiskId="1">
+                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/> 
+                            </Merge>
     <?else ?>
                             <Directory Id="msm_VBoxNetworkLwfFolder" FileSource=".">
@@ -272,5 +285,7 @@
                         <Directory Id="dir_NetAdp6" Name="netadp6">
 <?if $(env.VBOX_WITH_MSM_INSTALL) = "yes" ?>
-                            <Merge Id="msm_VBoxNetworkAdp6" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp6)" DiskId="1" />
+                            <Merge Id="msm_VBoxNetworkAdp6" Language="!(loc.LANG)" SourceFile="$(var.Property_VBoxMergeNetworkAdp6)" DiskId="1">
+                            <ConfigurationData Name="passedNetworkType" Value="[NETWORKTYPE]"/> 
+                            </Merge>
 <?else ?>
                             <Directory Id="msm_VBoxNetworkAdp6Folder" FileSource=".">