A beverage preparation machine (1) has a fluid circuit (3-10c) that comprises a liquid flavoring arrangement (9a, 3, 4, 5) for circulating a liquid, such as water, through a flavoring ingredient (2, 2′) to flavor this liquid and for dispensing this flavored liquid to a user-receptacle (100). The fluid circuit further comprises a dilution arrangement (9b, 9′, 9″) for mixing the liquid unflavored with the flavored liquid upon flavoring.