diff --git a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
index 97313094b74..3109f8898a9 100644
--- a/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
+++ b/src/Xamarin.Android.Build.Tasks/Utilities/MonoAndroidHelper.cs
@@ -470,12 +470,13 @@ public static Dictionary<string, string> LoadAcwMapFile (string acwPath)
 
 		public static string [] GetProguardEnvironmentVaribles (string proguardHome)
 		{
+			string proguardHomeVariable = "PROGUARD_HOME=" + proguardHome;
+
 			return Environment.OSVersion.Platform == PlatformID.Unix ?
-				new string [] { "PROGUARD_HOME=" + proguardHome } :
-				//TODO ReAdd the PROGUARD_HOME env variable once we are shipping our own proguard
+				new string [] { proguardHomeVariable } :
 				// Windows seems to need special care, needs JAVA_TOOL_OPTIONS.
 				// On the other hand, xbuild has a bug and fails to parse '=' in the value, so we skip JAVA_TOOL_OPTIONS on Mono runtime.
-				new string [] { "JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8" };
+				new string [] { proguardHomeVariable, "JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8" };
 		}
 	}
 }