diff --git a/external/LibZipSharp b/external/LibZipSharp
index d595ce24a02..5f43e4f89d7 160000
--- a/external/LibZipSharp
+++ b/external/LibZipSharp
@@ -1 +1 @@
-Subproject commit d595ce24a02b35989afe8e8087a238133ff679c2
+Subproject commit 5f43e4f89d79d9dc80c7f4ae313c4c83f7a1692c
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
index 4a1b2dcd60e..653e519819a 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
@@ -115,7 +115,7 @@ void ExecuteWithAbi (string supportedAbis, string apkInputPath, string apkOutput
 						Assembly.GetExecutingAssembly ().GetManifestResourceStream ("NOTICE.txt"));
 
 				// Add classes.dx
-				apk.AddFiles (DalvikClasses);
+				apk.AddFiles (DalvikClasses, useFileDirectories: false);
 
 				if (EmbedAssemblies && !BundleAssemblies)
 					AddAssemblies (apk);