Liquid-dispensing systems that include integrated aeration systems to aerate a liquid while the liquid is being dispensed are described. Integrated aeration systems enable seamless aeration of a liquid during dispensing. In one aspect, a liquid-dispensing system includes a liquid-conditioning dispenser with an integrated aeration system composed of one or more channels that convey a fluid to mix with a liquid as the liquid is dispensed. The aeration system also includes an aeration switch used to open and close the channels and regulate the amount of the fluid that mixes with the liquid. The liquid-dispensing system also includes a pump and control system to apply pressure on a reservoir that contains the liquid. The pressure forces the liquid from the reservoir to the dispenser via a liquid supply line.