diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
index 8f891588e2..bf5dfc5b49 100644
--- a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
+++ b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
@@ -93,6 +93,10 @@
Always
true
+
+ Always
+ true
+
true
diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/razorLanguageService64.servicehub.service.json b/tooling/Microsoft.VisualStudio.RazorExtension/razorLanguageService64.servicehub.service.json
new file mode 100644
index 0000000000..b4217084bd
--- /dev/null
+++ b/tooling/Microsoft.VisualStudio.RazorExtension/razorLanguageService64.servicehub.service.json
@@ -0,0 +1,11 @@
+{
+ "host": "desktopClr",
+ "hostId": "RoslynCodeAnalysisService",
+ "hostGroupAllowed": true,
+ "entryPoint": {
+ "assemblyPath": "Microsoft.CodeAnalysis.Remote.Razor.dll",
+ "fullClassName": "Microsoft.CodeAnalysis.Remote.Razor.RazorLanguageService",
+ "appBasePath": "%VSAPPIDDIR%",
+ "configPath": "%PkgDefApplicationConfigFile%"
+ }
+}
\ No newline at end of file
diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest b/tooling/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest
index 6494e606f5..351d34eff4 100644
--- a/tooling/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest
+++ b/tooling/Microsoft.VisualStudio.RazorExtension/source.extension.vsixmanifest
@@ -23,6 +23,7 @@
+