diff --git a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Android/AndroidAgdePlatform.cs b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Android/AndroidAgdePlatform.cs
index 8e0126fa1..2ed826aa9 100644
--- a/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Android/AndroidAgdePlatform.cs
+++ b/Sharpmake.Platforms/Sharpmake.CommonPlatforms/Android/AndroidAgdePlatform.cs
@@ -398,12 +398,14 @@ public override void SelectCompilerOptions(IGenerationContext context)
                 Options.Option(Options.Agde.Compiler.CppLanguageStandard.Cpp14, () => { options["CppLanguageStandard"] = "cpp14"; cmdLineOptions["CppLanguageStd"] = "-std=c++14"; }),
                 Options.Option(Options.Agde.Compiler.CppLanguageStandard.Cpp1z, () => { options["CppLanguageStandard"] = "cpp1z"; cmdLineOptions["CppLanguageStd"] = "-std=c++1z"; }),
                 Options.Option(Options.Agde.Compiler.CppLanguageStandard.Cpp17, () => { options["CppLanguageStandard"] = "cpp17"; cmdLineOptions["CppLanguageStd"] = "-std=c++17"; }),
+                Options.Option(Options.Agde.Compiler.CppLanguageStandard.Cpp20, () => { options["CppLanguageStandard"] = "cpp20"; cmdLineOptions["CppLanguageStd"] = "-std=c++20"; }),
                 Options.Option(Options.Agde.Compiler.CppLanguageStandard.Gnupp98, () => { options["CppLanguageStandard"] = "gnupp98"; cmdLineOptions["CppLanguageStd"] = "-std=gnu++98"; }),
                 Options.Option(Options.Agde.Compiler.CppLanguageStandard.Gnupp03, () => { options["CppLanguageStandard"] = "gnupp03"; cmdLineOptions["CppLanguageStd"] = "-std=gnu++03"; }),
                 Options.Option(Options.Agde.Compiler.CppLanguageStandard.Gnupp11, () => { options["CppLanguageStandard"] = "gnupp11"; cmdLineOptions["CppLanguageStd"] = "-std=gnu++11"; }),
                 Options.Option(Options.Agde.Compiler.CppLanguageStandard.Gnupp14, () => { options["CppLanguageStandard"] = "gnupp14"; cmdLineOptions["CppLanguageStd"] = "-std=gnu++14"; }),
                 Options.Option(Options.Agde.Compiler.CppLanguageStandard.Gnupp1z, () => { options["CppLanguageStandard"] = "gnupp1z"; cmdLineOptions["CppLanguageStd"] = "-std=gnu++1z"; }),
-                Options.Option(Options.Agde.Compiler.CppLanguageStandard.Gnupp17, () => { options["CppLanguageStandard"] = "gnupp17"; cmdLineOptions["CppLanguageStd"] = "-std=gnu++17"; })
+                Options.Option(Options.Agde.Compiler.CppLanguageStandard.Gnupp17, () => { options["CppLanguageStandard"] = "gnupp17"; cmdLineOptions["CppLanguageStd"] = "-std=gnu++17"; }),
+                Options.Option(Options.Agde.Compiler.CppLanguageStandard.Gnupp20, () => { options["CppLanguageStandard"] = "gnupp20"; cmdLineOptions["CppLanguageStd"] = "-std=gnu++20"; })
                 );
 
                 context.SelectOption
diff --git a/Sharpmake/Options.Agde.cs b/Sharpmake/Options.Agde.cs
index ab2acf846..b0d17acfa 100644
--- a/Sharpmake/Options.Agde.cs
+++ b/Sharpmake/Options.Agde.cs
@@ -436,6 +436,14 @@ public enum CppLanguageStandard
                     /// </remarks>
                     Cpp17,
 
+                    /// <summary>
+                    /// C++20
+                    /// </summary>
+                    /// <remarks>
+                    /// C++20 Language Standard.
+                    /// </remarks>
+                    Cpp20,
+
                     /// <summary>
                     /// C++98 (GNU Dialect)
                     /// </summary>
@@ -482,7 +490,15 @@ public enum CppLanguageStandard
                     /// <remarks>
                     /// C++17 (GNU Dialect) Language Standard.
                     /// </remarks>
-                    Gnupp17
+                    Gnupp17,
+
+                    /// <summary>
+                    /// C++20 (GNU Dialect)
+                    /// </summary>
+                    /// <remarks>
+                    /// C++20 (GNU Dialect) Language Standard.
+                    /// </remarks>
+                    Gnupp20
                 }
 
                 /// <summary>