A coffee machine for preparing hot, milk-containing beverages and having a milk supply (15) and a discharge means (8). In order to achieve improved handling, the milk supply (15) is configured for accommodating concentrated milk, and a mixing device (17) is provided for mixing the concentrated milk with water.