diff --git a/NuGet/Pack.bat b/NuGet/Pack.bat
index 3af7f82..4d6c184 100644
--- a/NuGet/Pack.bat
+++ b/NuGet/Pack.bat
@@ -1,7 +1,7 @@
 @rem cd ..\..\linq2db\Source
 @rem call Compile.bat
 
-cd ..\..\linq2db.t4models\ToolsGenerator
+cd ..\ToolsGenerator
 
 %windir%\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe ToolsGenerator.csproj /property:Configuration=Release
 
diff --git a/NuGet/linq2db.t4models.nuspec b/NuGet/linq2db.t4models.nuspec
index 8982684..52dbe5b 100644
--- a/NuGet/linq2db.t4models.nuspec
+++ b/NuGet/linq2db.t4models.nuspec
@@ -16,6 +16,10 @@
 			linq linq2db LinqToDB ORM database DB T4 datamodel SqlServer Access SqlCe SqlServerCe MySql Firebird SQLite Sybase
 			Oracle ODP PostgreSQL DB2 Informix SapHana
 		</tags>
+
+		<contentFiles>
+			<files include="**/content/**/*.*" buildAction="None" />
+		</contentFiles>
 	</metadata>
 	<files>
 		<file src="..\packages\linq2db.1.8.0\lib\net40\linq2db.dll"    target="tools" />
@@ -46,7 +50,4 @@
 		<file src="..\Templates\Validation.ttinclude"                  target="content\LinqToDB.Templates" />
 		<file src="LinqToDB.Tools.ttinclude"                           target="content\LinqToDB.Templates" />
 	</files>
-	<contentFiles>
-		<files include="**/content/**/*.*" buildAction="None" />
-	</contentFiles>
 </package>
\ No newline at end of file
diff --git a/Redist/NuGet.exe b/Redist/NuGet.exe
index 4645f4b..305300a 100644
Binary files a/Redist/NuGet.exe and b/Redist/NuGet.exe differ