This book consists of a collection of thoroughly refereed revised papers selected from the submissions for presentation at the 6th International Workshop on Software Configuration Management, SCM-6, held in conjunction with ICSE '96 in Berlin, Germany, in March 1996. Besides 17 full papers, the book contains an introductory overview and 6 selected position papers. The papers are organized in topical sections on versioning models and experience, version space management, CM databases and workspaces, distributed configuration management, industrial experience with CM systems, and CM challenges for the 21st century.