diff --git a/appveyor.yml b/appveyor.yml
index 9c83b1f9d1..1d5d72f1df 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -3,6 +3,18 @@ os: Visual Studio 2015
 before_build:
 - git submodule update --init
 - nuget restore Perspex.sln
+
+
+configuration:
+  - Debug
+  - Release
+
+after_build:
+- ps: nuget\build-version.ps1 999.{build}.0-nightly
+
+artifacts:
+  - path: nuget\*.nupkg
+
 build:
   project: Perspex.sln
   verbosity: minimal
\ No newline at end of file
diff --git a/nuget/.gitignore b/nuget/.gitignore
index 93a9893778..d1dab00f5b 100644
--- a/nuget/.gitignore
+++ b/nuget/.gitignore
@@ -1,7 +1,2 @@
-- build/
-
-**/lib/**/*.dll
-**/lib/**/*.xml
-**/build/**/*.dll
-**/build/**/*.xml
+Perspex
 *.nupkg
\ No newline at end of file
diff --git a/nuget/build-version.ps1 b/nuget/build-version.ps1
new file mode 100644
index 0000000000..c6136ba707
--- /dev/null
+++ b/nuget/build-version.ps1
@@ -0,0 +1,47 @@
+rm -Force -Recurse .\Perspex -ErrorAction SilentlyContinue
+rm -Force -Recurse *.nupkg -ErrorAction SilentlyContinue
+Copy-Item template Perspex -Recurse
+sv lib "Perspex\lib\portable-windows8+net45"
+sv build "Perspex\build\net45"
+mkdir $lib -ErrorAction SilentlyContinue
+mkdir $build -ErrorAction SilentlyContinue
+
+Copy-Item ..\src\Perspex.Animation\bin\Release\Perspex.Animation.dll $lib
+Copy-Item ..\src\Perspex.Animation\bin\Release\Perspex.Animation.xml $lib
+Copy-Item ..\src\Perspex.Application\bin\Release\Perspex.Application.dll $lib
+Copy-Item ..\src\Perspex.Application\bin\Release\Perspex.Application.xml $lib
+Copy-Item ..\src\Perspex.Base\bin\Release\Perspex.Base.dll $lib
+Copy-Item ..\src\Perspex.Base\bin\Release\Perspex.Base.xml $lib
+Copy-Item ..\src\Perspex.Controls\bin\Release\Perspex.Controls.dll $lib
+Copy-Item ..\src\Perspex.Controls\bin\Release\Perspex.Controls.xml $lib
+Copy-Item ..\src\Perspex.Diagnostics\bin\Release\\Perspex.Diagnostics.dll $lib
+Copy-Item ..\src\Perspex.Diagnostics\bin\Release\\Perspex.Diagnostics.xml $lib
+Copy-Item ..\src\Perspex.Input\bin\Release\Perspex.Input.dll $lib
+Copy-Item ..\src\Perspex.Input\bin\Release\Perspex.Input.xml $lib
+Copy-Item ..\src\Perspex.Interactivity\bin\Release\Perspex.Interactivity.dll $lib
+Copy-Item ..\src\Perspex.Interactivity\bin\Release\Perspex.Interactivity.xml $lib
+Copy-Item ..\src\Perspex.Layout\bin\Release\Perspex.Layout.dll $lib
+Copy-Item ..\src\Perspex.Layout\bin\Release\Perspex.Layout.xml $lib
+Copy-Item ..\src\Perspex.SceneGraph\bin\Release\Perspex.SceneGraph.dll $lib
+Copy-Item ..\src\Perspex.SceneGraph\bin\Release\Perspex.SceneGraph.xml $lib
+Copy-Item ..\src\Perspex.Styling\bin\Release\Perspex.Styling.dll $lib
+Copy-Item ..\src\Perspex.Styling\bin\Release\Perspex.Styling.xml $lib
+Copy-Item ..\src\Perspex.Themes.Default\bin\Release\Perspex.Themes.Default.dll $lib
+Copy-Item ..\src\Perspex.Themes.Default\bin\Release\Perspex.Themes.Default.xml $lib
+Copy-Item ..\src\Markup\Perspex.Markup.Xaml\bin\Release\Perspex.Markup.Xaml.dll $lib
+Copy-Item ..\src\Markup\Perspex.Markup.Xaml\bin\Release\Perspex.Markup.Xaml.xml $lib
+Copy-Item ..\src\Perspex.HtmlRenderer\bin\Release\Perspex.HtmlRenderer.dll $lib
+Copy-Item ..\src\NGenerics\bin\Release\NGenerics.dll $lib
+
+Copy-Item ..\src\Windows\Perspex.Direct2D1\bin\Release\Perspex.Direct2D1.dll $build
+Copy-Item ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.dll $build
+Copy-Item ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.Direct2D1.dll $build
+Copy-Item ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.DXGI.dll $build
+Copy-Item ..\src\Windows\Perspex.Win32\bin\Release\Perspex.Win32.dll $build
+Copy-Item ..\src\Gtk\Perspex.Gtk\bin\Release\Perspex.Gtk.dll $build
+Copy-Item ..\src\Gtk\Perspex.Cairo\bin\Release\Perspex.Cairo.dll $build
+
+(gc Perspex\Perspex.nuspec).replace('#VERSION#', $args[0]) | sc Perspex\Perspex.nuspec
+
+nuget.exe pack Perspex\Perspex.nuspec
+rm -Force -Recurse .\Perspex
\ No newline at end of file
diff --git a/nuget/build.bat b/nuget/build.bat
deleted file mode 100644
index 8ef89045de..0000000000
--- a/nuget/build.bat
+++ /dev/null
@@ -1,39 +0,0 @@
-SET lib="Perspex\lib\portable-windows8+net45"
-SET build="Perspex\build\net45"
-
-mkdir %lib%
-mkdir %build%
-
-copy ..\src\Perspex.Animation\bin\Release\Perspex.Animation.dll %lib%
-copy ..\src\Perspex.Animation\bin\Release\Perspex.Animation.xml %lib%
-copy ..\src\Perspex.Application\bin\Release\Perspex.Application.dll %lib%
-copy ..\src\Perspex.Application\bin\Release\Perspex.Application.xml %lib%
-copy ..\src\Perspex.Base\bin\Release\Perspex.Base.dll %lib%
-copy ..\src\Perspex.Base\bin\Release\Perspex.Base.xml %lib%
-copy ..\src\Perspex.Controls\bin\Release\Perspex.Controls.dll %lib%
-copy ..\src\Perspex.Controls\bin\Release\Perspex.Controls.xml %lib%
-copy ..\src\Perspex.Diagnostics\bin\Release\\Perspex.Diagnostics.dll %lib%
-copy ..\src\Perspex.Diagnostics\bin\Release\\Perspex.Diagnostics.xml %lib%
-copy ..\src\Perspex.Input\bin\Release\Perspex.Input.dll %lib%
-copy ..\src\Perspex.Input\bin\Release\Perspex.Input.xml %lib%
-copy ..\src\Perspex.Interactivity\bin\Release\Perspex.Interactivity.dll %lib%
-copy ..\src\Perspex.Interactivity\bin\Release\Perspex.Interactivity.xml %lib%
-copy ..\src\Perspex.Layout\bin\Release\Perspex.Layout.dll %lib%
-copy ..\src\Perspex.Layout\bin\Release\Perspex.Layout.xml %lib%
-copy ..\src\Perspex.SceneGraph\bin\Release\Perspex.SceneGraph.dll %lib%
-copy ..\src\Perspex.SceneGraph\bin\Release\Perspex.SceneGraph.xml %lib%
-copy ..\src\Perspex.Styling\bin\Release\Perspex.Styling.dll %lib%
-copy ..\src\Perspex.Styling\bin\Release\Perspex.Styling.xml %lib%
-copy ..\src\Perspex.Themes.Default\bin\Release\Perspex.Themes.Default.dll %lib%
-copy ..\src\Perspex.Themes.Default\bin\Release\Perspex.Themes.Default.xml %lib%
-copy ..\src\Markup\Perspex.Markup.Xaml\bin\Release\Perspex.Markup.Xaml.dll %lib%
-copy ..\src\Markup\Perspex.Markup.Xaml\bin\Release\Perspex.Markup.Xaml.xml %lib%
-copy ..\src\NGenerics\bin\Release\NGenerics.dll %lib%
-
-copy ..\src\Windows\Perspex.Direct2D1\bin\Release\Perspex.Direct2D1.dll %build%
-copy ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.dll %build%
-copy ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.Direct2D1.dll %build%
-copy ..\src\Windows\Perspex.Direct2D1\bin\Release\SharpDX.DXGI.dll %build%
-copy ..\src\Windows\Perspex.Win32\bin\Release\Perspex.Win32.dll %build%
-
-nuget.exe pack Perspex\Perspex.nuspec
\ No newline at end of file
diff --git a/nuget/build.ps1 b/nuget/build.ps1
new file mode 100644
index 0000000000..cf5e814083
--- /dev/null
+++ b/nuget/build.ps1
@@ -0,0 +1 @@
+.\build-version.ps1 0.0.1-alpha
\ No newline at end of file
diff --git a/nuget/Perspex/Perspex.nuspec b/nuget/template/Perspex.nuspec
similarity index 95%
rename from nuget/Perspex/Perspex.nuspec
rename to nuget/template/Perspex.nuspec
index 432f210f05..c60d785256 100644
--- a/nuget/Perspex/Perspex.nuspec
+++ b/nuget/template/Perspex.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>Perspex</id>
-    <version>0.0.1-alpha</version>
+    <version>#VERSION#</version>
     <authors>stevenk</authors>
     <owners>stevenk</owners>
     <licenseUrl>http://opensource.org/licenses/MIT</licenseUrl>
diff --git a/nuget/Perspex/build/net45/perspex.targets b/nuget/template/build/net45/perspex.targets
similarity index 100%
rename from nuget/Perspex/build/net45/perspex.targets
rename to nuget/template/build/net45/perspex.targets
diff --git a/src/Perspex.HtmlRenderer/Perspex.HtmlRenderer.csproj b/src/Perspex.HtmlRenderer/Perspex.HtmlRenderer.csproj
index 3fef04c9de..672ff48184 100644
--- a/src/Perspex.HtmlRenderer/Perspex.HtmlRenderer.csproj
+++ b/src/Perspex.HtmlRenderer/Perspex.HtmlRenderer.csproj
@@ -29,7 +29,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;PCL</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
diff --git a/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj b/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj
index 01a3546f39..5644a3b83e 100644
--- a/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj
+++ b/tests/Perspex.RenderTests/Perspex.Cairo.RenderTests.csproj
@@ -34,7 +34,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;PERSPEX_CAIRO</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>