diff --git a/build.sh b/build.sh
index fd4205bf32..fdae863677 100755
--- a/build.sh
+++ b/build.sh
@@ -1,8 +1,31 @@
 #!/usr/bin/env bash
+set -e
 
 if hash powershell 2>/dev/null; then
     echo 'Continuing with `powershell -noprofile -c Start-PSBuild`'
     powershell -noprofile -c "Import-Module ./build.psm1; Start-PSBuild"
 else
-    echo 'No `powershell`, see docs/building/linux.md or macos.md to build PowerShell!'
+   echo 'Continuing with full manual build'
+   dotnet restore
+   pushd src/ResGen
+   dotnet run
+   popd
+
+   pushd src/TypeCatalogParser
+   dotnet run
+   popd
+
+   pushd src/TypeCatalogGen
+   dotnet run ../Microsoft.PowerShell.CoreCLR.AssemblyLoadContext/CorePsTypeCatalog.cs powershell.inc
+   popd
+
+   pushd src/libpsl-native
+   cmake -DCMAKE_BUILD_TYPE=Debug .
+   make -j
+   make test
+   popd
+
+   dotnet publish --configuration Linux ./src/powershell-unix/ --output bin
+
+   echo 'You can run powershell from bin/, but some modules that are normally added by the Restore-PSModule step will not be available.'
 fi
diff --git a/src/ResGen/project.json b/src/ResGen/project.json
index 695a6b2ac3..92410e028d 100644
--- a/src/ResGen/project.json
+++ b/src/ResGen/project.json
@@ -17,6 +17,7 @@
     },
     
     "runtimes": {
+        "ubuntu.16.10-x64": { },
         "ubuntu.16.04-x64": { },
         "ubuntu.14.04-x64": { },
         "debian.8-x64": { },
diff --git a/src/TypeCatalogGen/project.json b/src/TypeCatalogGen/project.json
index c5fb126cb1..18b73d036a 100644
--- a/src/TypeCatalogGen/project.json
+++ b/src/TypeCatalogGen/project.json
@@ -44,6 +44,7 @@
     "runtimes": {
         "ubuntu.14.04-x64": { },
         "ubuntu.16.04-x64": { },
+        "ubuntu.16.10-x64": { },
         "debian.8-x64": { },
         "centos.7-x64": { },
         "win7-x86": { },
diff --git a/src/TypeCatalogParser/project.json b/src/TypeCatalogParser/project.json
index 3c26f16fd7..6eef8fd7d2 100644
--- a/src/TypeCatalogParser/project.json
+++ b/src/TypeCatalogParser/project.json
@@ -43,6 +43,7 @@
     "runtimes": {
         "ubuntu.14.04-x64": { },
         "ubuntu.16.04-x64": { },
+        "ubuntu.16.10-x64": { },
         "centos.7-x64": { },
         "win7-x86": { },
         "win7-x64": { },
diff --git a/src/powershell-unix/project.json b/src/powershell-unix/project.json
index 2b09001e51..f63c3b96c1 100644
--- a/src/powershell-unix/project.json
+++ b/src/powershell-unix/project.json
@@ -99,6 +99,7 @@
     "runtimes": {
         "ubuntu.14.04-x64": { },
         "ubuntu.16.04-x64": { },
+        "ubuntu.16.10-x64": { },
         "debian.8-x64": { },
         "centos.7-x64": { },
         "osx.10.11-x64": { }