diff --git a/setup/FSharp.Setup.props b/setup/FSharp.Setup.props
index 0ead30f9770..17ec131f3a6 100644
--- a/setup/FSharp.Setup.props
+++ b/setup/FSharp.Setup.props
@@ -4,12 +4,20 @@
     <PropertyGroup>
         <SchemaVersion>2.0</SchemaVersion>
         <ProductVersion>3.10</ProductVersion>
-        <FSharpPackageVersion>4.1</FSharpPackageVersion>
         <WiXToolset2015Version>3.10.0.1503</WiXToolset2015Version>
         <WixInstallPath>$(SetupRootFolder)\..\packages\WiX.Toolset.2015.$(WiXToolset2015Version)\tools\wix</WixInstallPath>
         <NugetPackagesDir>$(SetupRootFolder)\..\packages</NugetPackagesDir>
     </PropertyGroup>
-
+    
+    <PropertyGroup>
+        <FSharpProductVersion>4.1</FSharpProductVersion>
+        <!-- BUILD_BUILDNUMBER is passed from Microbuild. Replace by today's date and (0) if it was a local build -->
+        <BUILD_BUILDNUMBER Condition="'$(BUILD_BUILDNUMBER)' == ''">$([System.DateTime]::Now.ToString(yyyyMMdd.0))</BUILD_BUILDNUMBER>
+        <!-- Remove .DRAFT suffix if it exists in the build number -->
+        <FSharpPackageVersion>$(FSharpProductVersion).$(BUILD_BUILDNUMBER.Replace(".DRAFT", ""))</FSharpPackageVersion>
+        <!-- FSharpPackageVersion should be {F# version}.{today's date}.{build number}. Example: 4.1.20160901.3 -->
+    </PropertyGroup>
+    
     <PropertyGroup>
         <TargetFramework Condition=" '$(TargetFramework)' == '' ">net40</TargetFramework>
         <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>