diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000000000..e0d527f36
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,47 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
+# Explicitly declare text files we want to always be normalized and converted 
+# to native line endings on checkout.
+*.c text
+*.h text
+*.cs text
+*.config text
+*.xml text
+*.manifest text
+*.bat text
+*.cmd text
+*.sh text
+*.txt text
+*.dat text
+*.rc text
+*.ps1 text
+*.psm1 text
+*.js text
+*.css text
+*.html text
+*.sln text
+*.DotSettings text
+*.csproj text
+*.ncrunchproject text
+*.fs text
+*.fsproj text
+*.liquid text
+*.boo text
+*.pp text
+*.targets text
+*.markdown text
+*.md text
+*.bat text
+*.xslt text
+
+# Declare files that will always have CRLF line endings on checkout.
+
+# Denote all files that are truly binary and should not be modified.
+*.ico binary
+*.gif binary
+*.png binary
+*.jpg binary
+*.dll binary
+*.exe binary
+*.pdb binary
diff --git a/src/Cedar.EventStore.GetEventStore/Cedar.EventStore.GetEventStore.csproj b/src/Cedar.EventStore.GetEventStore/Cedar.EventStore.GetEventStore.csproj
index 1cbab7aca..c69b435c1 100644
--- a/src/Cedar.EventStore.GetEventStore/Cedar.EventStore.GetEventStore.csproj
+++ b/src/Cedar.EventStore.GetEventStore/Cedar.EventStore.GetEventStore.csproj
@@ -53,6 +53,7 @@
     <Compile Include="ResolvedEventExtensions.cs" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Cedar.EventStore.GetEventStore.nuspec" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Cedar.EventStore.GetEventStore/Cedar.EventStore.GetEventStore.nuspec b/src/Cedar.EventStore.GetEventStore/Cedar.EventStore.GetEventStore.nuspec
index 81d330374..7d194950a 100644
--- a/src/Cedar.EventStore.GetEventStore/Cedar.EventStore.GetEventStore.nuspec
+++ b/src/Cedar.EventStore.GetEventStore/Cedar.EventStore.GetEventStore.nuspec
@@ -20,8 +20,8 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="..\..\build\merged\Cedar.EventStore.GetEventStore.dll" target="net45" />
-        <file src="..\..\build\merged\Cedar.EventStore.GetEventStore.pdb" target="net45" />
+        <file src="..\..\build\merged\Cedar.EventStore.GetEventStore.dll" target="lib\net45" />
+        <file src="..\..\build\merged\Cedar.EventStore.GetEventStore.pdb" target="lib\net45" />
         <file src="bin\Release\Cedar.EventStore.xml" target="net45" />
     </files>
 </package>
diff --git a/src/Cedar.EventStore/Cedar.EventStore.csproj b/src/Cedar.EventStore/Cedar.EventStore.csproj
index 45d10cff1..2fddb123e 100644
--- a/src/Cedar.EventStore/Cedar.EventStore.csproj
+++ b/src/Cedar.EventStore/Cedar.EventStore.csproj
@@ -66,6 +66,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="Cedar.EventStore.nuspec" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />