The invention relates to a floor-cleaning system, comprising a self-propelled and self-steering floor-cleaning apparatus (12) for cleaning a floor surface (20), which floor-cleaning apparatus has a control unit (32), a controllable chassis (30), at least one cleaning unit (34), a locating component (64), and a communication component (66); and a portable auxiliary apparatus (14) for a user (16), which auxiliary apparatus has an operating unit (76), a control unit (70), and a communication component (72), wherein a cleaning order to the floor-cleaning apparatus (12) to clean the floor surface (20) at the user location can be triggered by the user (16) by means of the operating unit (76) and said cleaning order can be transmitted to the floor-cleaning apparatus (12), wherein position information concerning the user location can be transferred to the floor-cleaning apparatus (12), and wherein the floor-cleaning apparatus (12) can be moved to the user location and the floor surface (20) at the user location can be cleaned by means of the at least one cleaning unit (34) in accordance with the cleaning order. The invention further relates to a method for floor cleaning.