Selection and breeding of genotypes with improved drought/heat tolerance become key issues in the course of global change with predicted increased frequency of droughts or heat waves. Several morphological and physiological plant traits must be considered. Rooting depth, root branching, nutrient acquisition, mycorrhization, nodulation in legumes and the release of nutrients, assimilates or phytohormones to the shoot are relevant in root systems. Xylem embolism and its repair after a drought, development of axillary buds and solute channeling via xylem (acropetal) and phloem (basipetal and acropetal) are key processes in the stem. The photosynthetically active biomass depends on leaf expansion and senescence. Cuticle thickness and properties, epicuticular waxes, stomatal regulation including responses to phytohormones, stomatal plugs and mesophyll resistance are involved in optimizing leaf water relations. Aquaporins, dehydrins, enzymes involved in the metabolism of compatible solutes (e.g., proline) and Rubisco activase are examples for proteins involved in heat or drought susceptibility. Assimilate redistribution from leaves to maturing fruits via the phloem influences yield quantity and quality. Proteomic analyses allow a deeper insight into the network of stress responses and may serve as a basis to identify suitable genotypes, although improved stress tolerance will have its price (often lowered productivity under optimal conditions).