diff --git a/src/Xamarin.Android.Tools.AndroidSdk/AndroidVersions.cs b/src/Xamarin.Android.Tools.AndroidSdk/AndroidVersions.cs
index ef371570..734aa1cf 100644
--- a/src/Xamarin.Android.Tools.AndroidSdk/AndroidVersions.cs
+++ b/src/Xamarin.Android.Tools.AndroidSdk/AndroidVersions.cs
@@ -214,6 +214,9 @@ static bool MatchesId (AndroidVersion version, string id)
 			new AndroidVersion (new Version ("36.1"), "16.0") {
 				AlternateIds = new[]{ "Canary" },
 			},
+			new AndroidVersion (new Version ("37.0"), "17.0") {
+				AlternateIds = new[]{ "CinnamonBun", "Cinnamon Bun" },
+			},
 		};
 	}
 }