diff --git a/generators/app/index.js b/generators/app/index.js
index 7bc5695..6d91070 100644
--- a/generators/app/index.js
+++ b/generators/app/index.js
@@ -134,6 +134,12 @@ module.exports = Generator.extend({
       this.destinationPath(path.join(this.props.name, learningNamespace, 'packages.config')),
       this.props
     );
+    if (this.props.buildGrammar) {
+      this.fs.copy(
+        this.templatePath('solution/app/BuildGrammar.targets'),
+        this.destinationPath(path.join(this.props.name, this.props.name, 'BuildGrammar.targets'))
+      );
+    }
   },
 
   install: function () {
diff --git a/generators/app/templates/solution/app/App.csproj b/generators/app/templates/solution/app/App.csproj
index 5cd3ca2..6b8f3fa 100644
--- a/generators/app/templates/solution/app/App.csproj
+++ b/generators/app/templates/solution/app/App.csproj
@@ -2,7 +2,7 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{EFBD1A76-0A93-4CE8-8579-A0E6C078E341}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace><%= name %></RootNamespace>
@@ -10,7 +10,7 @@
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -21,7 +21,7 @@
     <ExternalConsole>true</ExternalConsole>
     <PlatformTarget>x86</PlatformTarget>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
     <ErrorReport>prompt</ErrorReport>
@@ -207,9 +207,10 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="<%= name %>.grammar">
+    <Content Include="<%= name %>.grammar">
+      <Label>GrammarDefinition</Label>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\<%= name %>.<%= semantics %>\<%= name %>.<%= semantics %>.csproj">
@@ -222,4 +223,24 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <% if (buildGrammar) { %>
+  <ItemGroup>
+    <DslAssemblyReference Include="$(SolutionDir)<%= name %>.<%= semantics %>/$(OutputPath)/<%= name %>.<%= semantics %>.dll" >
+      <InProject>false</InProject>
+    </DslAssemblyReference>
+    <DslAssemblyReference Include="$(SolutionDir)<%= name %>.<%= learning %>/$(OutputPath)/<%= name %>.<%= learning %>.dll" >
+      <InProject>false</InProject>
+    </DslAssemblyReference>
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="<%= name %>.Language">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>$(OutputPath)\<%= name %>.Language.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="BuildGrammar.targets" />
+  </ItemGroup>
+  <Import Project="BuildGrammar.targets" />
+  <% } %>
 </Project>
diff --git a/generators/app/templates/solution/app/BuildGrammar.targets b/generators/app/templates/solution/app/BuildGrammar.targets
new file mode 100644
index 0000000..1fa5568
--- /dev/null
+++ b/generators/app/templates/solution/app/BuildGrammar.targets
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Target Name="SetProperties">
+    <ItemGroup>
+      <GrammarDefinition Include="@(Content)" Condition="'%(Content.Label)' == 'GrammarDefinition'"/>
+    </ItemGroup>
+    <ItemGroup>
+      <DslCompiler Include="$(SolutionDir)packages/Microsoft.ProgramSynthesis*/tools/dslc.exe"/>
+    </ItemGroup>
+    <PropertyGroup>
+      <InputGrammar>@(GrammarDefinition -> '%(FullPath)')</InputGrammar>
+      <DslName>@(GrammarDefinition -> '%(Filename)')</DslName>
+      <DslCompiler Condition="'$(OS)' == 'Windows_NT'">&quot;@(DslCompiler -> '%(FullPath)')&quot;</DslCompiler>
+      <DslCompiler Condition="'$(OS)' != 'Windows_NT'">mono &quot;@(DslCompiler -> '%(FullPath)')&quot;</DslCompiler>
+    </PropertyGroup>
+    <ItemGroup>
+      <AssemblyPaths Include="@(DslAssemblyReference -> '%(RootDir)%(Directory)')"/>
+    </ItemGroup>
+    <ItemGroup>
+      <!-- Fix the double-backslash-in-quoted-strings problem on Windows.
+      See http://weblogs.asp.net/jongalloway/_5B002E00_NET-Gotcha_5D00_-Commandline-args-ending-in-_5C002200_-are-subject-to-CommandLineToArgvW-whackiness -->
+      <AssemblyPathsFixedSlash Include="@(AssemblyPaths -> Replace('\', '/'))"/>
+    </ItemGroup>
+    <ItemGroup>
+      <OutputGrammar Include="@(GrammarDefinition -> '$(TargetDir)%(Filename).Language.dll')"/>
+    </ItemGroup>
+  </Target>
+  <Target Name="RecompileGrammar" DependsOnTargets="SetProperties">
+    <Message Importance="High" Text="Recompiling $(InputGrammar) using $(DSLCompiler)..."/>
+    <PropertyGroup>
+      <DslcCommand>$(DslCompiler) -p &quot;@(AssemblyPathsFixedSlash)&quot; -o &quot;@(OutputGrammar)&quot; -v verbose -- &quot;$(InputGrammar)&quot;</DslcCommand>
+    </PropertyGroup>
+    <Message Importance="High" Text="$(DslcCommand)"/>
+    <Exec Command="$(DslcCommand)"/>
+  </Target>
+  <Target Name="AfterResolveReferences" DependsOnTargets="SetProperties"
+          Inputs="$(InputGrammar);@(DslAssemblyReference -> '%(FullPath)');" Outputs="@(OutputGrammar)">
+    <CallTarget Targets="RecompileGrammar" />
+  </Target>
+</Project>
diff --git a/generators/app/templates/solution/app/Grammar.grammar b/generators/app/templates/solution/app/Grammar.grammar
index 42f7960..3bd2619 100644
--- a/generators/app/templates/solution/app/Grammar.grammar
+++ b/generators/app/templates/solution/app/Grammar.grammar
@@ -10,5 +10,6 @@ language <%= name %>;
 
 @complete feature double <%= scoreFeature %> = <%= scoreHolder %>;
 
-// Your grammar rules here
-
+// Your grammar rules here. For example:
+@start string P := x;
+@input string x;
diff --git a/generators/app/templates/solution/semantics/Semantics.csproj b/generators/app/templates/solution/semantics/Semantics.csproj
index 31f42d5..4ae87e9 100644
--- a/generators/app/templates/solution/semantics/Semantics.csproj
+++ b/generators/app/templates/solution/semantics/Semantics.csproj
@@ -30,8 +30,8 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Semantics.cs" />
+    <Compile Include="<%= semantics %>.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+</Project>