diff --git a/build/linux/copy-coreclr-runtime.sh b/build/linux/copy-coreclr-runtime.sh
index 3d37d969022127b2d51829a23a46fe4c8b2fd701..a381b2343adcf9820a2a530a569f251056580e08 100755
--- a/build/linux/copy-coreclr-runtime.sh
+++ b/build/linux/copy-coreclr-runtime.sh
@@ -16,4 +16,12 @@ if [ ! -f "$CORECLR_DIR/csc" ]; then
     cp "$RUNTIME_SOURCE_DIR/coreconsole" $CORECLR_DIR/csc
 fi
 
+if [ -f "$CORECLR_DIR/vbc.exe" ]; then
+    mv "$CORECLR_DIR/vbc.exe" "$CORECLR_DIR/vbc.dll"
+fi
+
+if [ ! -f "$CORECLR_DIR/vbc" ]; then
+    cp "$RUNTIME_SOURCE_DIR/coreconsole" $CORECLR_DIR/vbc
+fi
+
 cp $RUNTIME_SOURCE_DIR/{*.dll,*.so} "$CORECLR_DIR"
diff --git a/cibuild.sh b/cibuild.sh
index ffc0eecfaecab57555af7d97f92e5379001422f1..0fe10ef2941acbb5028af0d34c22edf9d30ee1e4 100755
--- a/cibuild.sh
+++ b/cibuild.sh
@@ -152,31 +152,27 @@ compile_toolset()
 {
     echo Compiling the toolset compilers
     echo -e "Compiling the C# compiler"
-    run_msbuild src/Compilers/CSharp/csc/csc.csproj /p:Configuration=$BUILD_CONFIGURATION
+    run_msbuild src/Compilers/CSharp/CscCore/CscCore.csproj /p:Configuration=$BUILD_CONFIGURATION
     echo -e "Compiling the VB compiler"
-    run_msbuild src/Compilers/VisualBasic/vbc/vbc.csproj /p:Configuration=$BUILD_CONFIGURATION
+    run_msbuild src/Compilers/VisualBasic/Vbc/VbcCore.csproj /p:Configuration=$BUILD_CONFIGURATION
 }
 
 # Save the toolset binaries from Binaries/BUILD_CONFIGURATION to Binaries/Bootstrap
 save_toolset()
 {
-    local compiler_binaries=(
-        csc.exe
-        Microsoft.CodeAnalysis.dll
-        Microsoft.CodeAnalysis.CSharp.dll
-        System.Collections.Immutable.dll
-        System.Reflection.Metadata.dll
-        vbc.exe
-        Microsoft.CodeAnalysis.VisualBasic.dll)
-
     mkdir Binaries/Bootstrap
-    for i in ${compiler_binaries[@]}; do
-        cp Binaries/$BUILD_CONFIGURATION/${i} Binaries/Bootstrap/${i}
-        if [ $? -ne 0 ]; then
-            echo Saving bootstrap binaries failed
-            exit 1
-        fi
-    done
+    cp Binaries/$BUILD_CONFIGURATION/core-clr/* Binaries/Bootstrap
+
+    if [ "$OS_NAME" == "Linux" ]; then
+      # Copy over the CoreCLR runtime
+      ./build/linux/copy-coreclr-runtime.sh Binaries/Bootstrap
+      if [ $? -ne 0 ]; then
+        echo Saving bootstrap binaries failed
+        exit 1
+      fi
+      chmod +x Binaries/Bootstrap/csc
+      chmod +x Binaries/Bootstrap/vbc
+    fi 
 }
 
 # Clean out all existing binaries.  This ensures the bootstrap phase forces
@@ -190,7 +186,12 @@ clean_roslyn()
 
 build_roslyn()
 {    
-    local bootstrapArg=/p:BootstrapBuildPath=$(pwd)/Binaries/Bootstrap
+    local bootstrapArg=""
+
+    if [ "$OS_NAME" == "Linux" ]; then
+      bootstrapArg="/p:CscToolPath=$(pwd)/Binaries/Bootstrap /p:CscToolExe=csc \
+/p:VbcToolPath=$(pwd)/Binaries/Bootstrap /p:VbcToolExe=vbc"
+    fi
 
     echo Building CrossPlatform.sln
     run_msbuild $bootstrapArg CrossPlatform.sln /p:Configuration=$BUILD_CONFIGURATION