Peptides derived from non-ribosomal peptide synthetases (NRPSs) represent an important class of pharmaceutically relevant drugs. Methods to generate novel non-ribosomal peptides or to modify peptide natural products in an easy and predictable way are therefore of great interest. However, although the overall modular structure of NRPSs suggests the possibility of adjusting domain specificity and selectivity, only a few examples have been reported and these usually show a severe drop in production titre. Here we report a new strategy for the modification of NRPSs that uses defined exchange units (XUs) and not modules as functional units. XUs are fused at specific positions that connect the condensation and adenylation domains and respect the original specificity of the downstream module to enable the production of the desired peptides. We also present the use of internal condensation domains as an alternative to other peptide-chain-releasing domains for the production of cyclic peptides.