The conditional sampling of coherent structures in large-eddy simulations of the convective boundary layer (Couvreux et al. Boundary-layer Meteorol 134:441-458, 2010) is used to propose and evaluate formulations of fractional entrainment and detrainment rates for mass-flux schemes. The proposed formulations are physically-based and continuous from the surface to the top of clouds. Entrainment is related to the updraft vertical velocity divergence, while detrainment depends on the thermal vertical velocity, on buoyancy and on the moisture contrast between the mean plume and its environment. The proposed formulations are first directly evaluated in simulations of shallow clouds. They are then tested in single-column simulations with the thermal plume model, a mass-flux representation of boundary-layer thermals.