diff --git a/resources/install/build.xml b/resources/install/build.xml
index 959411747..7083b42d8 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -690,6 +690,7 @@
                 <include name="*.wxl" />
                 <include name="installer-windows.wxs" />
                 <include name="SCRegistrySpec.wxi" />
+                <include name="DefaultOverridesProps.wxi" />
                 <include name="windows_shortcut_specification.wxi" />
             </fileset>
         </copy>
diff --git a/resources/install/windows/DefaultOverridesProps.wxi b/resources/install/windows/DefaultOverridesProps.wxi
new file mode 100644
index 000000000..500f743e7
--- /dev/null
+++ b/resources/install/windows/DefaultOverridesProps.wxi
@@ -0,0 +1,95 @@
+<?xml version="1.0" ?>
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
+<!--
+  Jitsi, the OpenSource Java VoIP and Instant Messaging client.
+
+  Distributable under LGPL license.
+  See terms of license at gnu.org.
+-->
+	<Fragment>
+		<ComponentGroup Id="ComponentGroup_DefaultOverrides">
+			<Component
+				Id="ComponentGroup_DefaultOverrides_Provisioning_Method"
+				Directory="lib"
+				Guid="A1D53A23-11C6-4886-BB34-E70B68CF8CF4">
+				<Condition><![CDATA[PROV_METHOD]]></Condition>
+				<IniFile
+					Id="DefaultOverrides_ProvisioningMethodOnly"
+					Action="addLine"
+					Directory="lib"
+					Name="jitsi-default-overrides.properties"
+					Section="#dummy"
+					Key="net.java.sip.communicator.plugin.provisioning.METHOD"
+					Value="[PROV_METHOD]"
+				/>
+				<CreateFolder/>
+			</Component>
+			<Component
+				Id="ComponentGroup_DefaultOverrides_Provisioning_URL"
+				Directory="lib"
+				Guid="36516208-617E-4901-B52C-E35D25FDC2C8">
+				<Condition><![CDATA[PROV_URL]]></Condition>
+				<IniFile
+					Id="DefaultOverrides_ProvisioningManualMethodForUrl"
+					Action="addLine"
+					Directory="lib"
+					Name="jitsi-default-overrides.properties"
+					Section="#dummy"
+					Key="net.java.sip.communicator.plugin.provisioning.METHOD"
+					Value="Manual"
+				/>
+				<IniFile
+					Id="DefaultOverrides_ProvisioningUrl"
+					Action="addLine"
+					Directory="lib"
+					Name="jitsi-default-overrides.properties"
+					Section="#dummy"
+					Key="net.java.sip.communicator.plugin.provisioning.URL"
+					Value="[PROV_URL]"
+				/>
+				<CreateFolder/>
+			</Component>
+			<Component
+				Id="ComponentGroup_DefaultOverrides_MandatoryProvisioning_Method"
+				Directory="lib"
+				Guid="A1D53A23-11C6-4886-BB34-E70B68CF8CF4">
+				<Condition><![CDATA[MPROV_METHOD]]></Condition>
+				<IniFile
+					Id="DefaultOverrides_MandatoryProvisioningMethodOnly"
+					Action="addLine"
+					Directory="lib"
+					Name="jitsi-default-overrides.properties"
+					Section="#dummy"
+					Key="*net.java.sip.communicator.plugin.provisioning.METHOD"
+					Value="[MPROV_METHOD]"
+				/>
+				<CreateFolder/>
+			</Component>
+			<Component
+				Id="ComponentGroup_DefaultOverrides_MandatoryProvisioning_URL"
+				Directory="lib"
+				Guid="36516208-617E-4901-B52C-E35D25FDC2C8">
+				<Condition><![CDATA[MPROV_URL]]></Condition>
+				<IniFile
+					Id="DefaultOverrides_MandatoryProvisioningManualMethodForUrl"
+					Action="addLine"
+					Directory="lib"
+					Name="jitsi-default-overrides.properties"
+					Section="#dummy"
+					Key="*net.java.sip.communicator.plugin.provisioning.METHOD"
+					Value="Manual"
+				/>
+				<IniFile
+					Id="DefaultOverrides_MandatoryProvisioningUrl"
+					Action="addLine"
+					Directory="lib"
+					Name="jitsi-default-overrides.properties"
+					Section="#dummy"
+					Key="*net.java.sip.communicator.plugin.provisioning.URL"
+					Value="[MPROV_URL]"
+				/>
+				<CreateFolder/>
+			</Component>
+		</ComponentGroup>
+	</Fragment>
+</Include>
diff --git a/resources/install/windows/installer-windows.wxs b/resources/install/windows/installer-windows.wxs
index 95c1082ab..c70623d8a 100644
--- a/resources/install/windows/installer-windows.wxs
+++ b/resources/install/windows/installer-windows.wxs
@@ -132,6 +132,7 @@
   <ComponentRef Id="Component_StartupShortcut" />
 
   <ComponentGroupRef Id="ComponentGroup_RegistryEntries" />
+  <ComponentGroupRef Id="ComponentGroup_DefaultOverrides" />
 </Feature>
 
 <!--
@@ -671,5 +672,6 @@
     </Fragment>
 
 <?include SCRegistrySpec.wxi ?>
+<?include DefaultOverridesProps.wxi ?>
 
 </Wix>