diff --git a/CHANGES.md b/CHANGES.md
index 2e4766edb..718d3c811 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,6 +10,12 @@
   - CodeBetter TeamCity: <http://teamcity.codebetter.com/project.html?projectId=LibGit2Sharp&guest=1>
   - Travis: <https://travis-ci.org/libgit2/libgit2sharp>
 
+## v0.21 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.20...v0.20.1))
+
+### Fixes
+
+ - Update libgit2 to prevent issues around ".git" folders in trees on Windows and Mac
+
 ## v0.20 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.19...v0.20))
 
 ### Additions
diff --git a/Lib/NativeBinaries/amd64/git2-3f8d005.dll b/Lib/NativeBinaries/amd64/git2-3f8d005.dll
deleted file mode 100644
index b7c5193cd..000000000
Binary files a/Lib/NativeBinaries/amd64/git2-3f8d005.dll and /dev/null differ
diff --git a/Lib/NativeBinaries/amd64/git2-91fa31f.dll b/Lib/NativeBinaries/amd64/git2-91fa31f.dll
new file mode 100644
index 000000000..23469a709
Binary files /dev/null and b/Lib/NativeBinaries/amd64/git2-91fa31f.dll differ
diff --git a/Lib/NativeBinaries/amd64/git2-3f8d005.pdb b/Lib/NativeBinaries/amd64/git2-91fa31f.pdb
similarity index 52%
rename from Lib/NativeBinaries/amd64/git2-3f8d005.pdb
rename to Lib/NativeBinaries/amd64/git2-91fa31f.pdb
index 01c00edd9..bccb161f8 100644
Binary files a/Lib/NativeBinaries/amd64/git2-3f8d005.pdb and b/Lib/NativeBinaries/amd64/git2-91fa31f.pdb differ
diff --git a/Lib/NativeBinaries/x86/git2-3f8d005.dll b/Lib/NativeBinaries/x86/git2-3f8d005.dll
deleted file mode 100644
index 9754921f6..000000000
Binary files a/Lib/NativeBinaries/x86/git2-3f8d005.dll and /dev/null differ
diff --git a/Lib/NativeBinaries/x86/git2-91fa31f.dll b/Lib/NativeBinaries/x86/git2-91fa31f.dll
new file mode 100644
index 000000000..638ca411b
Binary files /dev/null and b/Lib/NativeBinaries/x86/git2-91fa31f.dll differ
diff --git a/Lib/NativeBinaries/x86/git2-3f8d005.pdb b/Lib/NativeBinaries/x86/git2-91fa31f.pdb
similarity index 52%
rename from Lib/NativeBinaries/x86/git2-3f8d005.pdb
rename to Lib/NativeBinaries/x86/git2-91fa31f.pdb
index 576c18572..0c0e89206 100644
Binary files a/Lib/NativeBinaries/x86/git2-3f8d005.pdb and b/Lib/NativeBinaries/x86/git2-91fa31f.pdb differ
diff --git a/LibGit2Sharp/Core/NativeDllName.cs b/LibGit2Sharp/Core/NativeDllName.cs
index ecd41aaa6..24fff1f25 100644
--- a/LibGit2Sharp/Core/NativeDllName.cs
+++ b/LibGit2Sharp/Core/NativeDllName.cs
@@ -2,6 +2,6 @@ namespace LibGit2Sharp.Core
 {
 	internal static class NativeDllName
 	{
-		public const string Name = "git2-3f8d005";
+		public const string Name = "git2-91fa31f";
 	}
 }
diff --git a/LibGit2Sharp/Properties/AssemblyInfo.cs b/LibGit2Sharp/Properties/AssemblyInfo.cs
index 0811ab3d7..ba9b2997a 100644
--- a/LibGit2Sharp/Properties/AssemblyInfo.cs
+++ b/LibGit2Sharp/Properties/AssemblyInfo.cs
@@ -42,5 +42,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("0.20.0")]
-[assembly: AssemblyFileVersion("0.20.0")]
+[assembly: AssemblyVersion("0.20.1")]
+[assembly: AssemblyFileVersion("0.20.1")]
diff --git a/LibGit2Sharp/libgit2_hash.txt b/LibGit2Sharp/libgit2_hash.txt
index d6a1f3602..30c8e8435 100644
--- a/LibGit2Sharp/libgit2_hash.txt
+++ b/LibGit2Sharp/libgit2_hash.txt
@@ -1 +1 @@
-3f8d005a82b39c504220d65b6a6aa696c3b1a9c4
+91fa31fb6f44919d5dcbaa157cfac9fb49dc44df
diff --git a/libgit2 b/libgit2
index 3f8d005a8..91fa31fb6 160000
--- a/libgit2
+++ b/libgit2
@@ -1 +1 @@
-Subproject commit 3f8d005a82b39c504220d65b6a6aa696c3b1a9c4
+Subproject commit 91fa31fb6f44919d5dcbaa157cfac9fb49dc44df
diff --git a/nuget.package/build/LibGit2Sharp.props b/nuget.package/build/LibGit2Sharp.props
index f3f5effd2..e1fd17ce0 100644
--- a/nuget.package/build/LibGit2Sharp.props
+++ b/nuget.package/build/LibGit2Sharp.props
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<ItemGroup>
-		<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-3f8d005.dll">
-			<Link>NativeBinaries\amd64\git2-3f8d005.dll</Link>
+		<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-91fa31f.dll">
+			<Link>NativeBinaries\amd64\git2-91fa31f.dll</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-		<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-3f8d005.pdb">
-			<Link>NativeBinaries\amd64\git2-3f8d005.pdb</Link>
+		<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\amd64\git2-91fa31f.pdb">
+			<Link>NativeBinaries\amd64\git2-91fa31f.pdb</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-		<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-3f8d005.dll">
-			<Link>NativeBinaries\x86\git2-3f8d005.dll</Link>
+		<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-91fa31f.dll">
+			<Link>NativeBinaries\x86\git2-91fa31f.dll</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
-		<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-3f8d005.pdb">
-			<Link>NativeBinaries\x86\git2-3f8d005.pdb</Link>
+		<None Include="$(MSBuildThisFileDirectory)\..\..\lib\net40\NativeBinaries\x86\git2-91fa31f.pdb">
+			<Link>NativeBinaries\x86\git2-91fa31f.pdb</Link>
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
 	</ItemGroup>