A motor vehicle with a combustion engine and/or electric drive. The motor vehicle has: a windshield; a water tank arranged in front of the windshield, which collects and drains water accumulating in a transition region between the windshield and a front hood. The water tank has a base element and a…