Polyuria–polydipsia syndrome can be caused by central diabetes insipidus, nephrogenic diabetes insipidus or primary polydipsia. To avoid confusion with diabetes mellitus, the name ‘central diabetes insipidus’ was changed in 2022 to arginine vasopressin (AVP) deficiency and ‘nephrogenic diabetes insipidus’ was renamed as AVP resistance. To differentiate the three entities, various osmotic and non-osmotic copeptin-based stimulation tests have been introduced in the past decade. The hypertonic saline test plus plasma copeptin measurement emerged as the test with highest diagnostic accuracy, replacing the water deprivation test as the gold standard in differential diagnosis of the polyuria–polydipsia syndrome. The mainstay of treatment for AVP deficiency is AVP replacement with desmopressin, a synthetic analogue of AVP specific for AVP receptor 2 (AVPR2), which usually leads to rapid improvements in polyuria and polydipsia. The main adverse effect of desmopressin is dilutional hyponatraemia, which can be reduced by regularly performing the so-called desmopressin escape method. Evidence from the past few years suggests an additional oxytocin deficiency in patients with AVP deficiency. This potential deficiency should be further evaluated in future studies, including feasible provocation tests for clinical practice and interventional trials with oxytocin substitution.