Software configuration management (SCM) products have evolved over the years and have become large and powerful, but they are not flexible enough to allow the user to pick the kind of control. In our work, we focus on two features of software configuration management systems: flexibility and collaboration. We present a new flexible software configuration management system called FSCM, which is designed to address the limits of current systems. In this paper, the main features of FSCM are discussed and a collaborationbased architecture of FSCM is presented.