diff --git a/src/Microsoft.Blazor.Build/Cli/Commands/BuildRazorCommand.cs b/src/Microsoft.Blazor.Build/Cli/Commands/BuildRazorCommand.cs
index f9acd45ec8..4a7451a7c2 100644
--- a/src/Microsoft.Blazor.Build/Cli/Commands/BuildRazorCommand.cs
+++ b/src/Microsoft.Blazor.Build/Cli/Commands/BuildRazorCommand.cs
@@ -25,13 +25,16 @@ namespace Microsoft.Blazor.Build.Cli.Commands
             var outputFilePath = command.Option("--output",
                 "The location where the resulting C# source file should be written",
                 CommandOptionType.SingleValue);
+            var baseNamespace = command.Option("--namespace",
+                "The base namespace for the generated C# classes.",
+                CommandOptionType.SingleValue);
             var verboseFlag = command.Option("--verbose",
                 "Indicates that verbose console output should written",
                 CommandOptionType.NoValue);
 
             command.OnExecute(() =>
             {
-                if (!VerifyRequiredOptionsProvided(sourceDirPath, outputFilePath))
+                if (!VerifyRequiredOptionsProvided(sourceDirPath, outputFilePath, baseNamespace))
                 {
                     return 1;
                 }
@@ -49,7 +52,7 @@ namespace Microsoft.Blazor.Build.Cli.Commands
                     var diagnostics = new RazorCompiler().CompileFiles(
                         sourceDirPathValue,
                         inputRazorFilePaths,
-                        "Blazor", // TODO: Add required option for namespace
+                        baseNamespace.Value(),
                         outputWriter,
                         verboseFlag.HasValue() ? Console.Out : null);
 
diff --git a/src/Microsoft.Blazor.Build/targets/RazorCompilation.targets b/src/Microsoft.Blazor.Build/targets/RazorCompilation.targets
index 290fc0e884..1eaa949419 100644
--- a/src/Microsoft.Blazor.Build/targets/RazorCompilation.targets
+++ b/src/Microsoft.Blazor.Build/targets/RazorCompilation.targets
@@ -1,11 +1,11 @@
 <Project>  
   <Target Name="BlazorCompileRazorComponents" BeforeTargets="CoreCompile">
     <PropertyGroup>
-      <BlazorComponentsNamespace>BlazorComponents</BlazorComponentsNamespace>
+      <BlazorComponentsNamespace>$(RootNamespace)</BlazorComponentsNamespace>
       <IsDesignTimeBuild Condition="'$(DesignTimeBuild)' == 'true' OR '$(BuildingProject)' != 'true'">true</IsDesignTimeBuild>
       <GeneratedFilePath>$(IntermediateOutputPath)BlazorRazorComponents.g.cs</GeneratedFilePath>
     </PropertyGroup>
-    <Exec Command="$(BlazorBuildExe) buildrazor --source $(ProjectDir) --output $(GeneratedFilePath)" />
+    <Exec Command="$(BlazorBuildExe) buildrazor --source $(ProjectDir) --namespace $(BlazorComponentsNamespace) --output $(GeneratedFilePath)" />
     <ItemGroup>
       <Compile Include="$(GeneratedFilePath)" />
     </ItemGroup>