Wheat, the most important crop in Australia, is grown in regions increasingly affected by high temperatures and drought. To face this climate change, we need to improve the crop’s ability to produce grains when challenged by heat and drought stresses. Novel, favourable alleles may be found in exotic germplasm. These genetic resources, however, also have a range of traits that limit their suitability for modern agriculture. Backcrossing to locally adapted varieties and pre-selection to eliminate undesirable traits improves their utility and improves evaluation in the field. We developed a nested association mapping (NAM) population by crossing 73 diverse wheat accessions from countries that are affected by heat and/or drought stress with two Australian recipient varieties, Gladius and Scout. Variability in flowering time and plant height was reduced by backcrossing the F1 with recipients and rogueing in the BC1F2 generation. To date, 100 NAM families, with around 20 lines per family, have been phenotyped in the field. We measured relative maturity (Zadoks’ score), plant height, grain yield, thousand grain weight, hectolitre weight and screenings. We genotyped all the lines using a customised genotyping by sequencing approach that generated approximately 5,000 polymorphic markers. We mapped loci associated with the different traits using a mixed linear model approach modified to allow the use of multiple alleles (haplotypes) and correction for population structure. We are currently generating exome-capture data from the parental lines to generate additional gene-level sequencing information. Using this combination of extensive population development, genomic data and analysis we found relevant loci associated with all traits. We will present an advanced, new genetic resource for developing drought and heat tolerant wheat.