diff --git a/CHANGES b/CHANGES
index 121cd6a5..d6f13c84 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,12 @@
+v0.8.1
+  - Improve time server identification
+  - Updated Swedish stratum 1 servers
+  - Fixed string truncation bug
+  - Build scripts cleanup
+
 v0.8.0
   - Import from ntp.exactlywww.com
-  - Fix string truncation bug
+  - Fixed string truncation bug
   - Generic autotool support
 
 v0.7.10
diff --git a/Makefile.xbuild b/Makefile.xbuild
index c87e36d4..1a303d08 100644
--- a/Makefile.xbuild
+++ b/Makefile.xbuild
@@ -1,10 +1,10 @@
 all: release
 
 debug:
-	xbuild	/p:Configuration=Debug /p:TargetFrameworkVersion=v4.0 /p:NPlot=nuget Ntp.Analyzer.sln
+	xbuild	/p:Configuration=Debug /p:TargetFrameworkVersion=v4.0 Ntp.Analyzer.sln
 
 release:
-	xbuild	/p:Configuration=Release /p:TargetFrameworkVersion=v4.0 /p:NPlot=nuget Ntp.Analyzer.sln
+	xbuild	/p:Configuration=Release /p:TargetFrameworkVersion=v4.0 Ntp.Analyzer.sln
 
 install: release
 	install -d ${DESTDIR}$(PREFIX)/sbin
diff --git a/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj b/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj
index db6177eb..5833cc66 100644
--- a/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj
+++ b/Ntp.Analyzer.Cli/Ntp.Analyzer.Cli.csproj
@@ -7,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>Ntp.Analyzer.Cli</RootNamespace>
     <StartupObject>Ntp.Analyzer.Cli.Program</StartupObject>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <AssemblyName>Ntp.Analyzer.Cli</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
diff --git a/Ntp.Analyzer.Cli/Program.cs b/Ntp.Analyzer.Cli/Program.cs
index d30b89a9..82fd178b 100644
--- a/Ntp.Analyzer.Cli/Program.cs
+++ b/Ntp.Analyzer.Cli/Program.cs
@@ -90,7 +90,7 @@ public static void Main(string[] args)
 
         private static void ShowUsage()
         {
-            Console.WriteLine("NTP Analyzer v0.8.0");
+            Console.WriteLine("NTP Analyzer v0.8.1");
             Console.WriteLine("Usage: ntpa --config file [--temp dir] [--writepid file] [--daemon name]");
             usage = true;
         }
diff --git a/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj b/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj
index a97806da..c77d2273 100644
--- a/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj
+++ b/Ntp.Analyzer.Data/Ntp.Analyzer.Data.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Ntp.Analyzer.Data</RootNamespace>
     <AssemblyName>Ntp.Analyzer.Data</AssemblyName>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj b/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj
index a94de7c1..ad4ff5f7 100644
--- a/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj
+++ b/Ntp.Analyzer.Import/Ntp.Analyzer.Import.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Ntp.Analyzer.Import</RootNamespace>
     <AssemblyName>Ntp.Analyzer.Import</AssemblyName>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Ntp.Analyzer.Monitor.Cli/Ntp.Analyzer.Monitor.Cli.csproj b/Ntp.Analyzer.Monitor.Cli/Ntp.Analyzer.Monitor.Cli.csproj
index af127311..dfac9085 100644
--- a/Ntp.Analyzer.Monitor.Cli/Ntp.Analyzer.Monitor.Cli.csproj
+++ b/Ntp.Analyzer.Monitor.Cli/Ntp.Analyzer.Monitor.Cli.csproj
@@ -6,7 +6,7 @@
     <ProjectGuid>{0349CF56-C07C-46B5-B9CD-2BCB2709EE0A}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>Ntp.Analyzer.Monitor.Cli</RootNamespace>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <AssemblyName>Ntp.Analyzer.Monitor.Cli</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
diff --git a/Ntp.Analyzer.Monitor.Client/Ntp.Analyzer.Monitor.Client.csproj b/Ntp.Analyzer.Monitor.Client/Ntp.Analyzer.Monitor.Client.csproj
index 3ec36efa..9f6b5dea 100644
--- a/Ntp.Analyzer.Monitor.Client/Ntp.Analyzer.Monitor.Client.csproj
+++ b/Ntp.Analyzer.Monitor.Client/Ntp.Analyzer.Monitor.Client.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Ntp.Analyzer.Monitor.Client</RootNamespace>
     <AssemblyName>Ntp.Analyzer.Monitor.Client</AssemblyName>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Ntp.Analyzer.Monitor.Server/Ntp.Analyzer.Monitor.Server.csproj b/Ntp.Analyzer.Monitor.Server/Ntp.Analyzer.Monitor.Server.csproj
index 16b754c1..5d2847a7 100644
--- a/Ntp.Analyzer.Monitor.Server/Ntp.Analyzer.Monitor.Server.csproj
+++ b/Ntp.Analyzer.Monitor.Server/Ntp.Analyzer.Monitor.Server.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Ntp.Analyzer.Monitor.Server</RootNamespace>
     <AssemblyName>Ntp.Analyzer.Monitor.Server</AssemblyName>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj b/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj
index d368038e..34da7afd 100644
--- a/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj
+++ b/Ntp.Analyzer.Objects/Ntp.Analyzer.Objects.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Ntp.Analyzer.Objects</RootNamespace>
     <AssemblyName>Ntp.Analyzer.Objects</AssemblyName>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -32,7 +32,6 @@
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>
@@ -60,9 +59,6 @@
     <Compile Include="HostIoReading.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ProjectExtensions>
     <MonoDevelop>
       <Properties>
diff --git a/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj b/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj
index 6a413f0c..5f42209d 100644
--- a/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj
+++ b/Ntp.Analyzer.Process/Ntp.Analyzer.Process.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Ntp.Analyzer.Process</RootNamespace>
     <AssemblyName>Ntp.Analyzer.Process</AssemblyName>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj b/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj
index ae60fdff..67a78ca9 100644
--- a/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj
+++ b/Ntp.Analyzer.Validate.Cli/Ntp.Analyzer.Validate.Cli.csproj
@@ -6,7 +6,7 @@
     <ProjectGuid>{9790FACF-170E-43C7-889A-D4445FC7E7A1}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>Ntp.Analyzer.Validate.Cli</RootNamespace>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <StartupObject>Ntp.Analyzer.Validate.Cli.Program</StartupObject>
     <AssemblyName>Ntp.Analyzer.Validate.Cli</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
diff --git a/Ntp.Analyzer.Validate.Cli/Program.cs b/Ntp.Analyzer.Validate.Cli/Program.cs
index fd836a35..872b3dca 100644
--- a/Ntp.Analyzer.Validate.Cli/Program.cs
+++ b/Ntp.Analyzer.Validate.Cli/Program.cs
@@ -140,7 +140,7 @@ private static void SetDecompilerParam(Decompiler decompiler, char indent, strin
 
         private static void ShowUsage()
         {
-            Console.WriteLine("NTP Analyzer validator tool v0.8.0");
+            Console.WriteLine("NTP Analyzer validator tool v0.8.1");
             Console.WriteLine("Usage: ntpav [-s|-v] [-d] [-t n|-w n] configuration");
             Console.WriteLine("    -s   Show parsed configuration");
             Console.WriteLine("    -v   Check if configuration is valid");
diff --git a/Ntp.Analyzer.Validate.Gui/Ntp.Analyzer.Validate.Gui.csproj b/Ntp.Analyzer.Validate.Gui/Ntp.Analyzer.Validate.Gui.csproj
index e0f74111..09bf0694 100644
--- a/Ntp.Analyzer.Validate.Gui/Ntp.Analyzer.Validate.Gui.csproj
+++ b/Ntp.Analyzer.Validate.Gui/Ntp.Analyzer.Validate.Gui.csproj
@@ -10,7 +10,7 @@
     <AssemblyName>Ntp.Analyzer.Validate.Gui</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
diff --git a/Ntp.Analyzer.sln b/Ntp.Analyzer.sln
index 8b7d183e..120c9b4d 100644
--- a/Ntp.Analyzer.sln
+++ b/Ntp.Analyzer.sln
@@ -123,7 +123,7 @@ Global
 		$5.IncludeInstanceMembers = True
 		$5.IncludeStaticEntities = True
 		description = NTP Analyzer is a tool dedicated to analyze the operation of time servers.
-		version = 0.8.0
+		version = 0.8.1
 		StartupItem = Ntp.Analyzer.Cli\Ntp.Analyzer.Cli.csproj
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
diff --git a/Ntp.Analyzer/Ntp.Analyzer.csproj b/Ntp.Analyzer/Ntp.Analyzer.csproj
index aa2e0ee5..4b1951ae 100644
--- a/Ntp.Analyzer/Ntp.Analyzer.csproj
+++ b/Ntp.Analyzer/Ntp.Analyzer.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Ntp.Analyzer</RootNamespace>
     <AssemblyName>Ntp.Analyzer</AssemblyName>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -211,9 +211,6 @@
     <Compile Include="Interface\IPathProvider.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Ntp.Analyzer.Objects\Ntp.Analyzer.Objects.csproj">
       <Project>{02912378-E62D-4445-BA30-F56D3ABE9DA2}</Project>
diff --git a/Ntp.Common/Ntp.Common.csproj b/Ntp.Common/Ntp.Common.csproj
index eeb2448c..fbd39690 100644
--- a/Ntp.Common/Ntp.Common.csproj
+++ b/Ntp.Common/Ntp.Common.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Ntp.Common</RootNamespace>
     <AssemblyName>Ntp.Common</AssemblyName>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Ntp.Data.Provider/Ntp.Data.Provider.csproj b/Ntp.Data.Provider/Ntp.Data.Provider.csproj
index 25179046..17c911e4 100644
--- a/Ntp.Data.Provider/Ntp.Data.Provider.csproj
+++ b/Ntp.Data.Provider/Ntp.Data.Provider.csproj
@@ -9,7 +9,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Ntp.Data.Provider</RootNamespace>
     <AssemblyName>Ntp.Data.Provider</AssemblyName>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Ntp.Data/Ntp.Data.csproj b/Ntp.Data/Ntp.Data.csproj
index 872c7f99..03020ac0 100644
--- a/Ntp.Data/Ntp.Data.csproj
+++ b/Ntp.Data/Ntp.Data.csproj
@@ -7,7 +7,7 @@
     <OutputType>Library</OutputType>
     <RootNamespace>Ntp.Data</RootNamespace>
     <AssemblyName>Ntp.Data</AssemblyName>
-    <ReleaseVersion>0.8.0</ReleaseVersion>
+    <ReleaseVersion>0.8.1</ReleaseVersion>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
diff --git a/Shared/AssemblyInfo.cs b/Shared/AssemblyInfo.cs
index b349e752..dfc79c67 100644
--- a/Shared/AssemblyInfo.cs
+++ b/Shared/AssemblyInfo.cs
@@ -22,7 +22,7 @@
 using System.Reflection;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyVersion("0.8.0.0")]
+[assembly: AssemblyVersion("0.8.1.0")]
 [assembly: AssemblyCopyright("Copyright (c) 2013-2016 Carsten Sonne Larsen <cs@innolan.dk>")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/configure.ac b/configure.ac
index 525537f0..20a4769e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.54])
-AC_INIT([ntpa], [0.8.0])
+AC_INIT([ntpa], [0.8.1])
 AM_INIT_AUTOMAKE([foreign])
 AM_MAINTAINER_MODE