diff --git a/src/Layout/redist/dnx b/src/Layout/redist/dnx
new file mode 100755
index 000000000000..e9e6823e10ad
--- /dev/null
+++ b/src/Layout/redist/dnx
@@ -0,0 +1,2 @@
+#!/bin/sh
+"$(dirname "$0")/dotnet" dnx "$@"
diff --git a/src/Layout/redist/dnx.cmd b/src/Layout/redist/dnx.cmd
new file mode 100644
index 000000000000..16aa653df873
--- /dev/null
+++ b/src/Layout/redist/dnx.cmd
@@ -0,0 +1,2 @@
+@echo off
+"%~dp0dotnet.exe" dnx %*
diff --git a/src/Layout/redist/targets/GenerateInstallerLayout.targets b/src/Layout/redist/targets/GenerateInstallerLayout.targets
index c69666ecbe06..ff1f5cb1345d 100644
--- a/src/Layout/redist/targets/GenerateInstallerLayout.targets
+++ b/src/Layout/redist/targets/GenerateInstallerLayout.targets
@@ -64,6 +64,17 @@
                       Overwrite="true" />
   </Target>
 
+  <Target Name="LayoutDnxScript">
+    <PropertyGroup>
+      <DnxScriptSource Condition="$([MSBuild]::IsOSPlatform('WINDOWS'))">dnx.cmd</DnxScriptSource>
+      <DnxScriptSource Condition="!$([MSBuild]::IsOSPlatform('WINDOWS'))">dnx</DnxScriptSource>
+    </PropertyGroup>
+    <Copy SourceFiles="$(DnxScriptSource)" DestinationFolder="$(RedistInstallerLayoutPath)" />
+
+    <!-- Mark script as executable -->
+    <Exec Command="chmod 644 &quot;$(RedistInstallerLayoutPath)/dnx&quot;" Condition="!$([MSBuild]::IsOSPlatform('Windows'))" />
+  </Target>
+
   <!-- Replace files from the runtime packs with symbolic links to the corresponding shared framework files (and hostfxr) to reduce the size of the runtime pack directories. -->
   <Target Name="ReplaceBundledRuntimePackFilesWithSymbolicLinks" DependsOnTargets="LayoutBundledComponents"
                                                                  Condition="'$(BundleRuntimePacks)' == 'true' and !$([MSBuild]::IsOSPlatform('WINDOWS'))">
@@ -81,6 +92,7 @@
                             LayoutManifests;
                             LayoutBaselineWorkloadSet;
                             LayoutWorkloadUserLocalMarker;
+                            LayoutDnxScript;
                             CrossgenLayout;
                             ReplaceBundledRuntimePackFilesWithSymbolicLinks"
           AfterTargets="AfterBuild" />
@@ -101,6 +113,10 @@
           DestinationFiles="@(SdkOutputFile -> '$(IntermediateSdkInstallerOutputPath)sdk\$(Version)\%(RecursiveDir)%(Filename)%(Extension)')"
           UseHardLinksIfPossible="true"
           SkipUnchangedFiles="true" />
+
+    <!-- Copy dnx script to root dotnet folder (which will map to DOTNETHOME) -->
+    <Copy SourceFiles="dnx.cmd" DestinationFolder="$(IntermediateSdkInstallerOutputPath)" />
+    
   </Target>
 
 </Project>
diff --git a/src/Layout/redist/targets/GenerateLayout.targets b/src/Layout/redist/targets/GenerateLayout.targets
index 2560cc533d93..23b6d6a0f5c2 100644
--- a/src/Layout/redist/targets/GenerateLayout.targets
+++ b/src/Layout/redist/targets/GenerateLayout.targets
@@ -278,9 +278,6 @@
           DestinationFiles="$(OutputPath)/%(BundledTools.Identity).runtimeconfig.json"
           SkipUnchangedFiles="true" />
 
-    <Delete Files="$(OutputPath)/$(TargetName).deps.json;
-                   $(OutputPath)/$(TargetName).runtimeconfig.json" />
-
     <Delete Files="$(OutputPath)/%(BundledToolProjects.Identity).dll;
                    $(OutputPath)/%(BundledToolProjects.Identity).pdb" />