We present a Lagrangian model for non-uniform soil water dynamics. It handles 2-D diffusion (based on a spatial random walk and implicit pore space redistribution) and 1-D advection in representative macropores (as film flow with dynamic interaction with the soil matrix). The interplay between the domains is calculated based on an energy-balance approach which does not require any additional parameterisation. Model tests give insight into the evolution of the non-uniform infiltration patterns.