diff --git a/tools/generator/CodeGenerator.cs b/tools/generator/CodeGenerator.cs
index 33df6cd92..3e341e619 100644
--- a/tools/generator/CodeGenerator.cs
+++ b/tools/generator/CodeGenerator.cs
@@ -53,7 +53,6 @@ static void Run (CodeGeneratorOptions options, DirectoryAssemblyResolver resolve
 			string enum_flags       = options.EnumFlagsFile;
 			string enum_methods_map = options.EnumMethodsMapFile;
 			var fixups              = options.FixupFiles;
-			string api_versions_xml = options.ApiVersionsXmlFile;
 			var annotations_zips    = options.AnnotationsZipFiles;
 			string filename         = options.ApiDescriptionFile;
 			string mapping_file     = options.MappingReportFile;
@@ -157,8 +156,9 @@ static void Run (CodeGeneratorOptions options, DirectoryAssemblyResolver resolve
 
 			Validate (gens, opt, new CodeGeneratorContext ());
 
-			if (api_versions_xml != null)
+			foreach (var api_versions_xml in options.ApiVersionsXmlFiles) {
 				ApiVersionsSupport.AssignApiLevels (gens, api_versions_xml);
+			}
 
 			foreach (GenBase gen in gens)
 				gen.FillProperties ();
diff --git a/tools/generator/CodeGeneratorOptions.cs b/tools/generator/CodeGeneratorOptions.cs
index c3b085dcf..2df51b0b8 100644
--- a/tools/generator/CodeGeneratorOptions.cs
+++ b/tools/generator/CodeGeneratorOptions.cs
@@ -10,6 +10,7 @@ public class CodeGeneratorOptions
 	{
 		public CodeGeneratorOptions ()
 		{
+			ApiVersionsXmlFiles = new Collection<string> ();
 			AssemblyReferences  = new Collection<string> ();
 			FixupFiles          = new Collection<string> ();
 			LibraryPaths        = new Collection<string> ();
@@ -26,7 +27,9 @@ public CodeGeneratorOptions ()
 		public bool                 GlobalTypeNames {get; set;}
 		public bool                 OnlyBindPublicTypes {get; set;}
 		public string               ApiDescriptionFile {get; set;}
+		[Obsolete ("Use ApiVersionsXmlFiles")]
 		public string               ApiVersionsXmlFile {get; set;}
+		public Collection<string>   ApiVersionsXmlFiles {get; set;}
 		public Collection<string>   AnnotationsZipFiles {get; set;}
 		public string               EnumFieldsMapFile {get; set;}
 		public string               EnumFlagsFile {get; set;}
@@ -138,7 +141,7 @@ public static CodeGeneratorOptions Parse (string[] args)
 					v => opts.EnumMethodsMapFile = v },
 				{ "apiversions=",
 					"For internal use.",
-					v => opts.ApiVersionsXmlFile = v },
+					v => opts.ApiVersionsXmlFiles.Add (v) },
 				{ "annotations=",
 					"For internal use.",
 					v => opts.AnnotationsZipFiles.Add (v) },