This work treats the problem of control and actuator fault-tolerance for a satellite system in a rendezvous mission. The mission consists in capturing a sample (called target) using a chaser satellite. The study considers the position and attitude dynamics of the chaser equipped with 12 thrusters. Firstly, a controller is designed for the chaser using flatness. The controller aims to move the system from an initial position/attitude to the position of the target with the adequate attitude. Since the chaser is an over-actuated system, a control allocation scheme is used to allocate over the thrusters, the efforts and moments generated by the controller. Secondly, actuator faults are considered. The chaser's thrusters are subject to two types of faults: jamming in closed position and jamming in open position. Using actuator redundancy, a control re-allocation scheme is used to accommodate actuator faults. The efficiency of the control and the FTC approaches are investigated in simulation.