diff --git a/build/targets/ConvertPortablePdbs.targets b/build/targets/ConvertPortablePdbs.targets
index 474fe091a5d..f4aff98425b 100644
--- a/build/targets/ConvertPortablePdbs.targets
+++ b/build/targets/ConvertPortablePdbs.targets
@@ -8,12 +8,13 @@
           AfterTargets="AfterBuild"
           DependsOnTargets="ComputeFinalOutputPaths"
           Condition="'$(OS)' != 'Unix' AND
+                     '$(SkipPDBConversion)' != 'true' AND
                      Exists('$(TargetPath)') AND
                      ('$(DebugType)' == 'portable' OR '$(DebugType)' == 'embedded') AND
-                     $(TargetFramework.StartsWith('net4')) AND
+                     $(TargetFramework.StartsWith('net')) AND
                      '$(Configuration)' != 'Proto'">
     <PropertyGroup>
-      <ConvertedPdbsDirectory>$(FinalOutputPath)\ConvertedPdbs</ConvertedPdbsDirectory>
+      <ConvertedPdbsDirectory>$(FinalOutputPath)\ConvertedPdbs\$(TargetFramework)</ConvertedPdbsDirectory>
       <PdbConverterExe>$(NuGetPackageRoot)Pdb2Pdb\$(Pdb2PdbPackageVersion)\tools\Pdb2Pdb.exe</PdbConverterExe>
       <PdbConverterArgs>"$(TargetPath)" /out "$(ConvertedPdbsDirectory)\$(TargetName).pdb" /srcsvrvar SRC_INDEX=public</PdbConverterArgs>
     </PropertyGroup>
diff --git a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
index cb84565e52d..6aa30585262 100644
--- a/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
+++ b/src/fsharp/FSharp.Compiler.Private/FSharp.Compiler.Private.fsproj
@@ -13,6 +13,7 @@
     <OtherFlags>$(OtherFlags) --warnon:1182 --maxerrors:20 --extraoptimizationloops:1</OtherFlags>
     <UseFSharpProductVersion>true</UseFSharpProductVersion>
     <UseAssetTargetFallback>true</UseAssetTargetFallback>
+    <SkipPDBConversion>true</SkipPDBConversion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'net472' AND '$(OS)' == 'Windows_NT'">