diff --git a/.gitignore b/.gitignore
index ad4f0df6bd..2de9740181 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,3 +82,4 @@ Thumbs.db
 Desktop.ini
 
 _NCrunch_GitVersion
+NuGetCommandLineBuild/
diff --git a/Build.cmd b/Build.cmd
index dfb2eae061..3a98d73eb8 100644
--- a/Build.cmd
+++ b/Build.cmd
@@ -6,7 +6,7 @@ set framework=v4.0.30319
 
 "%SystemDrive%\Windows\Microsoft.NET\Framework\%framework%\MSBuild.exe" "%~dp0GitVersion.sln"
 
-mkdir "%~dp0GitVersion\bin\Intermediate"
-cp "%~dp0GitVersion\bin\Debug\GitVersion.exe" "%~dp0GitVersion\bin\Intermediate\GitVersion.exe"
+mkdir "%~dp0GitVersionExe\bin\Intermediate"
+cp "%~dp0GitVersionExe\bin\Debug\GitVersion.exe" "%~dp0GitVersionExe\bin\Intermediate\GitVersion.exe"
 
-"%~dp0GitVersion\bin\Intermediate\GitVersion.exe" /l console /output buildserver /updateAssemblyInfo /proj "%~dp0GitVersion.sln"
+"%~dp0GitVersionExe\bin\Intermediate\GitVersion.exe" /l console /output buildserver /updateAssemblyInfo /proj "%~dp0GitVersion.sln"
diff --git a/GitVersionExe/GemAssets/gitversion.gemspec b/GitVersionExe/GemAssets/gitversion.gemspec
index 3b69af7928..099e0422b2 100644
--- a/GitVersionExe/GemAssets/gitversion.gemspec
+++ b/GitVersionExe/GemAssets/gitversion.gemspec
@@ -2,7 +2,7 @@ Gem::Specification.new do |spec|
   spec.platform    = Gem::Platform::RUBY
   spec.name        = 'gitversion'
   spec.licenses    = ['MIT']
-  spec.version     = '0.20.0'
+  spec.version     = '$version$'
   spec.summary     = 'Derives SemVer information from a repository following GitFlow or GitHubFlow.'
   spec.description = <<-EOF
 Derives SemVer information from a repository following GitFlow or GitHubFlow.
diff --git a/GitVersionExe/GitVersionExe.csproj b/GitVersionExe/GitVersionExe.csproj
index ae4264bf36..4996bf76ab 100644
--- a/GitVersionExe/GitVersionExe.csproj
+++ b/GitVersionExe/GitVersionExe.csproj
@@ -66,6 +66,7 @@
     <None Include="NugetAssets\chocolateyUninstall.ps1">
       <SubType>Designer</SubType>
     </None>
+    <None Include="NugetAssets\GitVersion.CommandLine.nuspec" />
     <None Include="NugetAssets\GitVersion.nuspec">
       <SubType>Designer</SubType>
     </None>
@@ -97,6 +98,28 @@
     </ItemGroup>
     <Delete Files="@(ExeFilesToDelete)" />
   </Target>
+  <UsingTask TaskName="ReplaceFileText" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll">
+    <ParameterGroup>
+      <InputFilename ParameterType="System.String" Required="true" />
+      <OutputFilename ParameterType="System.String" Required="true" />
+      <MatchExpression ParameterType="System.String" Required="true" />
+      <ReplacementText ParameterType="System.String" Required="true" />
+    </ParameterGroup>
+    <Task>
+      <Reference Include="System.Core" />
+      <Using Namespace="System" />
+      <Using Namespace="System.IO" />
+      <Using Namespace="System.Text.RegularExpressions" />
+      <Code Type="Fragment" Language="cs">
+        <![CDATA[
+            File.WriteAllText(
+                OutputFilename,
+                Regex.Replace(File.ReadAllText(InputFilename), MatchExpression, ReplacementText)
+                );
+          ]]>
+      </Code>
+    </Task>
+  </UsingTask>
   <Target Name="AfterBuild" DependsOnTargets="Clean">
     <!-- NugetExeBuild -->
     <MakeDir Directories="$(SolutionDir)NuGetExeBuild" />
@@ -104,17 +127,42 @@
     <Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
     <Copy SourceFiles="$(ProjectDir)NugetAssets\chocolateyInstall.ps1" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
     <Copy SourceFiles="$(ProjectDir)NugetAssets\chocolateyUninstall.ps1" DestinationFolder="$(SolutionDir)NuGetExeBuild\Tools" />
-    <Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.nuspec" DestinationFolder="$(SolutionDir)NuGetExeBuild" />
+    <Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.Portable.nuspec" DestinationFolder="$(SolutionDir)NuGetExeBuild" />
     <PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetExeBuild" MetadataAssembly="$(OutputPath)GitVersion.exe" />
+    <!-- NugetCommandLineBuild -->
+    <MakeDir Directories="$(SolutionDir)NuGetCommandLineBuild" />
+    <Copy SourceFiles="$(OutputPath)\GitVersion.pdb" DestinationFolder="$(SolutionDir)NuGetCommandLineBuild\Tools" />
+    <Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(SolutionDir)NuGetCommandLineBuild\Tools" />
+    <Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.CommandLine.nuspec" DestinationFolder="$(SolutionDir)NuGetCommandLineBuild" />
+    <PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetCommandLineBuild" MetadataAssembly="$(OutputPath)GitVersion.exe" />
     <!-- Gem -->
     <Copy SourceFiles="$(OutputPath)\GitVersion.pdb" DestinationFolder="$(SolutionDir)GemBuild\bin" />
     <Copy SourceFiles="$(OutputPath)\GitVersion.exe" DestinationFolder="$(SolutionDir)GemBuild\bin" />
     <ItemGroup>
       <GemFiles Include="$(ProjectDir)GemAssets\bin*\**\*.*" />
       <GemFiles Include="$(ProjectDir)GemAssets\lib*\**\*.*" />
+      <GemFiles Include="$(ProjectDir)GemAssets\spec*\**\*.*" />
       <GemFiles Include="$(ProjectDir)GemAssets\*.gemspec" />
+      <GemFiles Include="$(ProjectDir)GemAssets\.rspec" />
+      <GemFiles Include="$(ProjectDir)GemAssets\Guardfile" />
+      <GemFiles Include="$(ProjectDir)GemAssets\Gemfile" />
     </ItemGroup>
     <Copy SourceFiles="@(GemFiles)" DestinationFiles="@(GemFiles->'$(SolutionDir)GemBuild\%(RecursiveDir)%(Filename)%(Extension)')" />
+
+    <PropertyGroup>
+      <GemVersion Condition="'$(GitVersion_PreReleaseTag)' == ''">$(GitVersion_MajorMinorPatch)</GemVersion>
+      <GemVersion Condition="'$(GitVersion_PreReleaseTag)' != ''">$(GitVersion_MajorMinorPatch).$(GitVersion_PreReleaseTag)</GemVersion>
+    </PropertyGroup>
+    
+    <ReplaceFileText
+        InputFilename="$(SolutionDir)GemBuild\gitversion.gemspec"
+        OutputFilename="$(SolutionDir)GemBuild\gitversion.gemspec"
+        MatchExpression="\$version\$"
+        ReplacementText="$(GemVersion)"
+        Condition="'$(GitVersion_SemVer)' != ''"/>
+    
+    <Exec Command="gem build gitversion.gemspec" ContinueOnError="True"
+          WorkingDirectory="$(SolutionDir)GemBuild" Condition="'$(GitVersion_SemVer)' != ''" />
   </Target>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/GitVersionExe/NugetAssets/GitVersion.CommandLine.nuspec b/GitVersionExe/NugetAssets/GitVersion.CommandLine.nuspec
new file mode 100644
index 0000000000..8aafa36727
--- /dev/null
+++ b/GitVersionExe/NugetAssets/GitVersion.CommandLine.nuspec
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata>
+    <id>GitVersion.CommandLine</id>
+    <version>$version$</version>
+    <title>GitVersion</title>
+    <authors>NServiceBus Ltd</authors>
+    <owners>nservicebus, simoncropp</owners>
+    <licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
+    <projectUrl>http://github.com/Particular/GitVersion</projectUrl>
+    <iconUrl>https://raw.github.com/Particular/GitVersion/master/Icons/package_icon.png</iconUrl>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <description>Derives SemVer information from a repository following GitFlow or GitHubFlow.</description>
+    <language>en-AU</language>
+    <tags>Git, Versioning, GitVersion, GitFlowVersion, GitFlow, GitHubFlow, SemVer</tags>
+  </metadata>
+</package>
\ No newline at end of file
diff --git a/GitVersionExe/NugetAssets/GitVersion.nuspec b/GitVersionExe/NugetAssets/GitVersion.Portable.nuspec
similarity index 96%
rename from GitVersionExe/NugetAssets/GitVersion.nuspec
rename to GitVersionExe/NugetAssets/GitVersion.Portable.nuspec
index 8257f1ab6c..9d751fb310 100644
--- a/GitVersionExe/NugetAssets/GitVersion.nuspec
+++ b/GitVersionExe/NugetAssets/GitVersion.Portable.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
-    <id>GitVersion</id>
+    <id>GitVersion.Portable</id>
     <version>$version$</version>
     <title>GitVersion</title>
     <authors>NServiceBus Ltd</authors>