diff --git a/MsgPack.nuspec b/MsgPack.nuspec
index 8a6682537..3a4062a4f 100644
--- a/MsgPack.nuspec
+++ b/MsgPack.nuspec
@@ -86,5 +86,7 @@ This package provides MessagePack serialization/deserialization APIs. This pacak
   <files>
     <file src="bin\**\*.dll" target="lib" exclude="**\System.*;**\Microsoft.*;**\Mono.*" />
     <file src="bin\**\*.XML" target="lib" exclude="**\System.*;**\Microsoft.*;**\Mono.*" />
+    <file src="bin\**\*.pdb" target="lib" exclude="**\System.*;**\Microsoft.*;**\Mono.*" />
+    <file src="src\**\*.cs" target="src" />
   </files>
 </package>
\ No newline at end of file
diff --git a/appveyor-debug.yml b/appveyor-debug.yml
index 9e615f46b..6552638c2 100644
--- a/appveyor-debug.yml
+++ b/appveyor-debug.yml
@@ -2,31 +2,20 @@ version: '{branch}-{build}'
 image: Visual Studio 2017
 skip_tags: true
 configuration: Debug
-init:
-- cmd: >-
-    cd \
-
-    appveyor DownloadFile http://dl.google.com/android/android-sdk_r24.4.1-windows.zip
-
-    7z x android-sdk_r24.4.1-windows.zip > nul
-
-    cd %APPVEYOR_BUILD_FOLDER%
 assembly_info:
   patch: true
   file: '**\*AssemblyInfo.cs'
   assembly_version: $(AssemblyBaseVersion).0
   assembly_file_version: $(AssemblyBaseVersion).{build}
   assembly_informational_version: $(PackageVersion)
-environment:
-  ANDROID_HOME: C:\android-sdk-windows
 install:
-- ps: >-
-    cd ./build
+- cmd: >-
+    cd .\build
 
+    UpdateAndroidSdk.cmd
+- ps: >-
     ./SetBuildEnv.ps1
 
-    ./UpdateAndroidSdk.cmd
-
     cd ..
 build_script:
 - ps: >-
@@ -36,11 +25,15 @@ build_script:
 
     ./Build.ps1
 
+    if ( $LastExitCode -ne 0 )
+    {
+        Write-Error "Failed to build."
+        exit 1
+    }
+
     cd ..
 test_script:
 - cmd: >-
     cd ./build
 
     ./RunUnitTests.cmd
-
-    cd ..
diff --git a/appveyor-release.yml b/appveyor-release.yml
index 598ce2e36..131a306fe 100644
--- a/appveyor-release.yml
+++ b/appveyor-release.yml
@@ -4,32 +4,23 @@ branches:
   only:
   - master
   - 0.7
+  - 0.8
+  - 0.9
 configuration: Release
-init:
-- cmd: >-
-    cd \
-
-    appveyor DownloadFile http://dl.google.com/android/android-sdk_r24.4.1-windows.zip
-
-    7z x android-sdk_r24.4.1-windows.zip > nul
-
-    cd %APPVEYOR_BUILD_FOLDER%
 assembly_info:
   patch: true
   file: '**\*AssemblyInfo.cs'
   assembly_version: $(AssemblyBaseVersion).0
   assembly_file_version: $(AssemblyBaseVersion).{build}
   assembly_informational_version: $(PackageVersion)
-environment:
-  ANDROID_HOME: C:\android-sdk-windows
 install:
-- ps: >-
-    cd ./build
+- cmd: >-
+    cd .\build
 
+    UpdateAndroidSdk.cmd
+- ps: >-
     ./SetBuildEnv.ps1
 
-    ./UpdateAndroidSdk.cmd
-
     cd ..
 build_script:
 - ps: >-
@@ -39,12 +30,36 @@ build_script:
 
     ./Build.ps1
 
+    if ( $LastExitCode -ne 0 )
+    {
+        Write-Error "Failed to build."
+        exit 1
+    }
+
     appveyor PushArtifact "../dist/MsgPack.Cli.${env:PackageVersion}.nupkg"
 
+    if ( $LastExitCode -ne 0 )
+    {
+        Write-Error "Failed to publish nupkg."
+        exit 1
+    }
+
     appveyor PushArtifact "../dist/MsgPack.Cli.${env:PackageVersion}.symbols.nupkg"
 
+    if ( $LastExitCode -ne 0 )
+    {
+        Write-Error "Failed to publish symbol nupkg."
+        exit 1
+    }
+
     appveyor PushArtifact "../dist/MsgPack.Cli.${env:PackageVersion}.zip"
 
+    if ( $LastExitCode -ne 0 )
+    {
+        Write-Error "Failed to publish zip."
+        exit 1
+    }
+
     cd ..
 deploy:
 - provider: Environment
diff --git a/build/Build.ps1 b/build/Build.ps1
index ab4723f6d..004ac4190 100644
--- a/build/Build.ps1
+++ b/build/Build.ps1
@@ -147,7 +147,7 @@ if ( $LastExitCode -ne 0 )
 
 if ( $buildConfig -eq 'Release' )
 {
-	& $msbuild ../src/MsgPack/MsgPack.csproj /t:pack /p:Configuration=$buildConfig /p:NuspecProperties=version=$env:PackageVersion
+	& $msbuild ../src/MsgPack/MsgPack.csproj /t:pack /p:Configuration=$buildConfig /p:IncludeSymbols=true /p:IncludeSource=true /p:NuspecProperties=version=$env:PackageVersion
 
 	Move-Item ../bin/*.nupkg ../dist/
 	Copy-Item ../bin/* ./MsgPack-CLI/ -Recurse -Exclude @("*.vshost.*")
diff --git a/build/UpdateAndroidSdk.cmd b/build/UpdateAndroidSdk.cmd
index 25f2504a3..0e0d27807 100644
--- a/build/UpdateAndroidSdk.cmd
+++ b/build/UpdateAndroidSdk.cmd
@@ -1 +1 @@
-echo y | "%ANDROID_HOME%/tools/android.bat" --silent update sdk --no-ui --all --filter android-10,android-23,platform-tools,tools,build-tools-23.0.3
+echo y | "%ProgramFiles(x86)%\Android\android-sdk\tools\android.bat" --silent update sdk --no-ui --all --filter android-10,platform-tools,tools,build-tools-23.0.3