A computer-implemented method, system and/or computer program product manage software maintenance software in a computer system. A first snapshot is taken of first system states of a computer system. The first snapshot is mapped to a first maintenance software, which is further mapped to a specific user. The computer system is instructed to install the first maintenance software in response to an installation request from the specific user. If the specific user subsequently requests that the first maintenance software be removed from the computer system, then the mappings of the first snapshot and the first maintenance software are used to revert the computer system back to the first system states.