diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
index 7a3c9349a86..25ff85f82eb 100644
--- a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs
@@ -215,6 +215,10 @@ public override bool Execute ()
 			}
 			debugServer = androidDebugServer.Value;
 
+			if (string.IsNullOrEmpty (AndroidEmbedProfilers) && _Debug) {
+				AndroidEmbedProfilers = "log";
+			}
+
 			var outputFiles = new List<string> ();
 
 			ExecuteWithAbi (SupportedAbis, ApkInputPath, ApkOutputPath);
@@ -409,7 +413,7 @@ void AddProfilers (ZipFile apk, string abi)
 				foreach (var profiler in ParseProfilers (AndroidEmbedProfilers)) {
 					var library = string.Format ("libmono-profiler-{1}.{0}.so", abi, profiler);
 					var path = Path.Combine (root, "lib", abi, library);
-					apk.AddEntry (string.Format ("lib/{0}/libmono-profiler.so", abi), File.OpenRead (path));
+					apk.AddEntry (string.Format ("lib/{0}/libmono-profiler-{1}.so", abi, profiler), File.OpenRead (path));
 				}
 			}
 		}