SUMMARYA finite element method is used for computing the non-linear sloshing response of liquid in a twodimensional rigid rectangular tank with rigid baffles. The potential formulation is considered for the liquid domain and a mixed Eulerian-Langrangian scheme is adopted. The solution is obtained by the Galerkin method. The fourth-order Runge-Kutta method is employed to advance the solution in the time domain. A regridding technique is applied to the free surface of the liquid, which effectively eliminates the numerical instabilities without the use of artificial smoothing. Through the comparison with the available results for the rectangular tank without baffle, the validity of the present formulation is checked and then extended to the solution of tanks with rigid baffles. The effects of baffle parameters such as position, dimension and numbers on the non-linear sloshing response are examined. The present numerical solution procedure is also applied to the non-linear sloshing problems in a circular cylindrical container with annular baffle.