changed to stock BSD 2-clause license

Conflicts:

	AUTHORS
	README
	doc/appendix/contributors.txt

10 files changed, 246 insertions, 204 deletions

diff --git a/AUTHORS b/AUTHORS
deleted file mode 100644
index f13deb691..000000000
--- a/AUTHORS
+++ /dev/null
@@ -1,64 +0,0 @@
-In no particular order:
-
-- Narayan Desai <desai@mcs.anl.gov> has written most of Bcfg2,
-  including all parts not explicitly mentioned in this file.
-
-- Sol Jerome <sol.jerome@gmail.com> squashes bugs, helps manage the
-  project roadmap, and implements various interesting features.
-
-- Tim Laszlo <tim.laszlo@gmail.com> worked on the reporting system and
-  made plugins.
-
-- Fabian Affolter <fabian@bernewireless.net> made some patches, added  
-  some new features and plugins, and restructured the manual for Bcfg2.
-
-- Andrew Brestick <brestick@mcs.anl.gov> fixed bugs and completed 
-  plugins.
-
-- James Yang <jjyang@mcs.anl.gov> worked on bcfg2-admin and 
-  bcfg2-reports.
-
-- Robert Gogolok <gogo@cs.uni-sb.de> fixed bugs and made the code more
-  robust.
-
-- Jack Neely <jjneely@ncsu.edu> worked on YUMng.
-
-- Joey Hagedorn <hagedorn@mcs.anl.gov> has written the reporting
-  subsystem, including StatReports, GenerateHostinfo, and the xslt,
-  css and javascript associated with it.
-
-- Ed Smith <esmith4@inf.ed.ac.uk> has done substantial hardening of
-  the Bcfg2 client and server and implemented a common logging
-  infrastructure.
-
-- Rick Bradshaw <bradshaw@mcs.anl.gov> has written several of the
-  tools included in the tools/ subdirectory.
-
-- Ken Raffenetti <raffenet@mcs.anl.gov> and Rick Bradshaw have written
-  the Hostbase plugin.
-
-- Scott Behrens <behrens@mcs.anl.gov> and Rick Bradshaw have written
-  the VHost plugin.
-
-- Cory Lueninghoener <cory@mcs.anl.gov> wrote the showentries function
-  in bcfg2-info.
-
-- Chris Vuletich <vuletich@mcs.anl.gov> wrote some SSL code and the
-  verification debugging code.
-
-- Daniel Clark <dclark@pobox.com> created encap packages for Bcfg2 and
-  deps, wrote fossil-scm dvcs support, and helps with debian packaging
-
-- Jason Pepas <cell@ices.utexas.edu> has written a rpm package list
-  creator has contributed patches to the Red Hat toolset.
-
-- Sami Haahtinen <ressu@ressukka.net> has writen debian packaging
-  logic.
-
-- Brian Pellin and Andrew Lusk did substantial work on Bcfg1, some of
-  which was used in the Bcfg2 client.
-
-- Michael Jinks <mjinks@uchicago.edu> wrote the gentoo tool drivers.
-
-- Chris St. Pierre <stpierreca@ornl.gov> (re)wrote bcfg2-lint and has
-  made other miscellaneous contributions.
diff --git a/COPYRIGHT b/COPYRIGHT
index 39f0b0731..571fa6034 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,37 +1,154 @@
+- Narayan Desai <desai@mcs.anl.gov> has written most of Bcfg2,
+  including all parts not explicitly mentioned in this file.
 
-				  COPYRIGHT
+- Sol Jerome <sol.jerome@gmail.com> squashes bugs, helps manage the
+  project roadmap, and implements various interesting features.
 
-The following is a notice of limited availability of the code, and disclaimer
-which must be included in the prologue of the code and in all source listings
-of the code.
+- Tim Laszlo <tim.laszlo@gmail.com> worked on the reporting system and
+  made plugins.
 
-Copyright Notice
- + 2004 University of Chicago
+- Fabian Affolter <mail@fabian-affolter.ch> made some patches, added
+  some new features and plugins, and restructured the manual for Bcfg2.
 
-Permission is hereby granted to use, reproduce, prepare derivative works, and
-to redistribute to others.  This software was authored by:
+- Andrew Brestick <brestick@mcs.anl.gov> fixed bugs and completed
+  plugins.
 
-Argonne National Laboratory 
-N. Desai: (630) 252-7587; FAX: (630) 252-5986; e-mail: desai@mcs.anl.gov
-Mathematics and Computer Science Division
-Argonne National Laboratory, Argonne IL 60439
+- James Yang <jjyang@mcs.anl.gov> worked on bcfg2-admin and
+  bcfg2-reports.
 
+- Robert Gogolok <gogo@cs.uni-sb.de> fixed bugs and made the code more
+  robust.
 
-			      GOVERNMENT LICENSE
+- Jack Neely <jjneely@ncsu.edu> worked on the YUM driver.
 
-Portions of this material resulted from work developed under a U.S.
-Government Contract and are subject to the following license: the Government
-is granted for itself and others acting on its behalf a paid-up, nonexclusive,
-irrevocable worldwide license in this computer software to reproduce, prepare
-derivative works, and perform publicly and display publicly.
+- Joey Hagedorn <hagedorn@mcs.anl.gov> has written the reporting
+  subsystem, including StatReports, GenerateHostinfo, and the xslt,
+  css and javascript associated with it.
 
-				  DISCLAIMER
+- Ed Smith <esmith4@inf.ed.ac.uk> has done substantial hardening of
+  the Bcfg2 client and server and implemented a common logging
+  infrastructure.
 
-This computer code material was prepared, in part, as an account of work
-sponsored by an agency of the United States Government.  Neither the United
-States, nor the University of Chicago, nor any of their employees, makes any
-warranty express or implied, or assumes any legal liability or responsibility
-for the accuracy, completeness, or usefulness of any information, apparatus,
-product, or process disclosed, or represents that its use would not infringe
-privately owned rights.
+- Rick Bradshaw <bradshaw@mcs.anl.gov> has written several of the
+  tools included in the tools/ subdirectory.
 
+- Ken Raffenetti <raffenet@mcs.anl.gov>, Rick Bradshaw, Rene Martin,
+  and David Dahl <dahl@mcs.anl.gov> have written the Hostbase plugin.
+
+- Scott Behrens <behrens@mcs.anl.gov> and Rick Bradshaw have written
+  the VHost plugin.
+
+- Cory Lueninghoener <cory@mcs.anl.gov> wrote the showentries function
+  in bcfg2-info.
+
+- Chris Vuletich <vuletich@mcs.anl.gov> wrote some SSL code and the
+  verification debugging code.
+
+- Daniel Clark <dclark@pobox.com> created encap packages for Bcfg2 and
+  deps, wrote fossil-scm dvcs support, and helps with debian packaging
+
+- Jason Pepas <cell@ices.utexas.edu> has written a rpm package list
+  creator has contributed patches to the Red Hat toolset.
+
+- Sami Haahtinen <ressu@ressukka.net> has writen debian packaging
+  logic.
+
+- Brian Pellin and Andrew Lusk did substantial work on Bcfg1, some of
+  which was used in the Bcfg2 client.
+
+- Michael Jinks <mjinks@uchicago.edu> wrote the gentoo tool drivers.
+
+- Chris St. Pierre <chris.a.st.pierre@gmail.com> has (re)written vast
+  swaths of more recent Bcfg2 releases.
+
+- Anatoly Techtonik <techtonik@gmail.com> has fixed various bugs.
+
+- Arto Jantunen <viiru@debian.org> maintains the Debian packages.
+
+- Asaf Ohaion <asaf@arch64.office.lingnu.com> added Pacman support.
+
+- Brent Bloxam <brent.bloxam@gmail.com> fixed bugs, particularly in
+  the documentation.
+
+- Calen Pennington <cpennington@wgen.net> write bcfg2-test and
+  contributed performance enhancements.
+
+- Calvin Cheng <calvin@calvinx.com> worked on Python packaging.
+
+- Carl Jackson <carl@avtok.com> fixed client-side bugs.
+
+- Chris Brinker <chris.brinker@gmail.com> added support for client
+  profile assertion to bcfg2.conf
+
+- Christopher 'm4z' Holm <them4z@googlemail.com> greatly improved the
+  RPM build logic.
+
+- Dan Foster <dan.foster@bristol.ac.uk> contributed Solaris 10 build
+  fixes.
+
+- David Strauss <david@fourkitchens.com> wrote the Bzr plugin and
+  contributed other various fixes.
+
+- Gordon Messmer <gordon@herald.private.dragonsdawn.net> contributed
+  documentation fixes.
+
+- Graham Hagger <g.hagger@gmail.com> wrote the SSLCA plugin.
+
+- Holger Weiß <holger@zedat.fu-berlin.de> has fixed a tremendous
+  number and variety of bugs, particularly with unicode handling,
+  SSHbase, and bcfg2-reports.
+
+- Jake Davis <jake@imapenguin.com> has fixed various bugs.
+
+- Jason Kincl <kincljc@ornl.gov> added conflict resolution to the Svn
+  plugin.
+
+- Jeffrey C. Ollie <jeff@ocjtech.us> wrote systemd support.
+
+- Jeroen Dekkers <jeroen@dekkers.ch> worked on the APT driver.
+
+- Joe Digilio <jgd-github@metajoe.com> worked on Cheetah support and
+  fixed other bugs.
+
+- John Morris <john@zultron.com> fixed bugs in the Chkconfig driver.
+
+- John 'Skip' Reddy <jreddy@alcf.anl.gov> worked on DBStats.
+
+- Jonathan Billings <jsbillin@umich.edu> worked on systemd support,
+  RPM builds, and fixed other bugs.
+
+- Kamil Kisiel <kamil@kamilkisiel.net> worked on documentation, Py3k
+  support, launchd support, and other bugs.
+
+- Kioob <ob.kioob@daevel.fr> fixed various bugs.
+
+- Luke Cyca <me@lukecyca.com> worked on MacPorts and launchd support.
+
+- Mike Brady <mike.brady@devnull.net.nz> worked on the YUM and RPM
+  drivers.
+
+- Mike McCallister <mike@mccllstr.com> worked on the Packages plugin.
+
+- Phillip Steinbachs <phil@steinbachs.org> wrote Solaris packaging
+  manifests.
+
+- Raul Cuza <raulcuza@gmail.com> worked on Python packaging,
+  documentation, and various bugs.
+
+- Remi Broemeling <remi@infinitewinter.com> worked on handling
+  restarts of Service entries.
+
+- Richard Connon <conan@irconan.co.uk> worked on handling of Apt
+  repositories.
+
+- Steve Tousignant <stousignant@revolutionlinux.com> worked on several
+  of the Debian package list tools and contributed bug fixes.
+
+- Ti Legget <leggett@mcs.anl.gov> worked on ebuild packaging and
+  bugfixes, RPM packaging.
+
+- Torsten Rehn <torsten@rehn.tel> wrote the Ldap plugin and fixed
+  bugs.
+
+- Zach Lowry <zach@mcs.anl.gov> wrote Solaris support and general
+  hardening.
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000..9059c2ba4
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,48 @@
+Copyright (c) 2004, University of Chicago.  See the COPYRIGHT file at
+  the top-level directory of this distribution and at
+  https://github.com/Bcfg2/bcfg2/blob/master/COPYRIGHT.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimers.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimers in the
+  documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+			      GOVERNMENT LICENSE
+
+Portions of this material resulted from work developed under a U.S.
+Government Contract and are subject to the following license: the
+Government is granted for itself and others acting on its behalf a
+paid-up, nonexclusive, irrevocable worldwide license in this computer
+software to reproduce, prepare derivative works, and perform publicly
+and display publicly.
+
+				  DISCLAIMER
+
+This computer code material was prepared, in part, as an account of
+work sponsored by an agency of the United States Government.  Neither
+the United States, nor the University of Chicago, nor any of their
+employees, makes any warranty express or implied, or assumes any legal
+liability or responsibility for the accuracy, completeness, or
+usefulness of any information, apparatus, product, or process
+disclosed, or represents that its use would not infringe privately
+owned rights.
+
diff --git a/README b/README
index 7bc3388ce..c836961f7 100644
--- a/README
+++ b/README
@@ -1,26 +1,26 @@
 Bcfg2 - A Configuration Management System
 -----------------------------------------
 
-Bcfg2 (bee-config two) helps system administrators produce a 
+Bcfg2 (bee-config two) helps system administrators produce a
 consistent, reproducible, and verifiable description of their
 environment, and offers visualization and reporting tools to aid
 in day-to-day administrative tasks. It is the fifth generation of
 configuration management tools developed in the Mathematics and
-Computer Science Division of Argonne National Laboratory. 
+Computer Science Division of Argonne National Laboratory.
 
 * Homepage: http://bcfg2.org
 
 Bcfg2 is fairly portable. It has been successfully run on:
 
 * AIX, FreeBSD, OpenBSD Mac OS X, OpenSolaris, Solaris
-* Many GNU/Linux distributions, including ArchLinux, Blag, CentOS, 
+* Many GNU/Linux distributions, including ArchLinux, Blag, CentOS,
   Debian, Fedora, Gentoo, gNewSense, Mandriva, openSUSE, Red Hat/RHEL,
   SuSE/SLES, Trisquel, and Ubuntu.
-  
+
 Installation
 ------------
 
-For details about the installation of Bcfg2 please refer to the 
+For details about the installation of Bcfg2 please refer to the
 following pages in the Bcfg2 wiki.
 
 * Prerequisites: http://bcfg2.org/wiki/Prereqs
@@ -46,4 +46,5 @@ Want to help
 * Wiki:            http://bcfg2.org/wiki/Contribute
 
 
-Bcfg2 is licensed under BSD, for more details check COPYING.
+Bcfg2 is licensed under a Simplified (2-clause) BSD license. For more
+details check LICENSE.
diff --git a/debian/bcfg2-server.docs b/debian/bcfg2-server.docs
index 62deb0497..fea4b1e8f 100644
--- a/debian/bcfg2-server.docs
+++ b/debian/bcfg2-server.docs
@@ -1 +1,2 @@
-AUTHORS
+LICENSE
+COPYRIGHT
diff --git a/debian/bcfg2.docs b/debian/bcfg2.docs
index 62deb0497..57c7cb760 100644
--- a/debian/bcfg2.docs
+++ b/debian/bcfg2.docs
@@ -1 +1,3 @@
-AUTHORS
+LICENSE
+COPYRIGHT
+
diff --git a/debian/copyright b/debian/copyright
index 224d3659a..b7b93da85 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,44 +4,58 @@ It was downloaded from http://trac.mcs.anl.gov/projects/bcfg2/
 
 Upstream Author: Narayan Desai <desai@mcs.anl.gov>
 
-Copyright: 
- 2004 - 2006: University of Chicago
+Copyright:
+ 2004 - 20013: University of Chicago
 
 License:
 
 Unless otherwise specified, files are copyright by the following:
 
-The following is a notice of limited availability of the code, and disclaimer
-which must be included in the prologue of the code and in all source listings
-of the code.
-
-Copyright Notice
- + 2004 University of Chicago
-
-Permission is hereby granted to use, reproduce, prepare derivative works, and
-to redistribute to others.  This software was authored by:
-
-Argonne National Laboratory 
-N. Desai: (630) 252-7587; FAX: (630) 252-5986; e-mail: desai@mcs.anl.gov
-Mathematics and Computer Science Division
-Argonne National Laboratory, Argonne IL 60439
-
+Copyright (c) 2004, University of Chicago.  See the COPYRIGHT file at
+  the top-level directory of this distribution and at
+  https://github.com/Bcfg2/bcfg2/blob/master/COPYRIGHT.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimers.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimers in the
+  documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 			      GOVERNMENT LICENSE
 
 Portions of this material resulted from work developed under a U.S.
-Government Contract and are subject to the following license: the Government
-is granted for itself and others acting on its behalf a paid-up, nonexclusive,
-irrevocable worldwide license in this computer software to reproduce, prepare
-derivative works, and perform publicly and display publicly.
+Government Contract and are subject to the following license: the
+Government is granted for itself and others acting on its behalf a
+paid-up, nonexclusive, irrevocable worldwide license in this computer
+software to reproduce, prepare derivative works, and perform publicly
+and display publicly.
 
 				  DISCLAIMER
 
-This computer code material was prepared, in part, as an account of work
-sponsored by an agency of the United States Government.  Neither the United
-States, nor the University of Chicago, nor any of their employees, makes any
-warranty express or implied, or assumes any legal liability or responsibility
-for the accuracy, completeness, or usefulness of any information, apparatus,
-product, or process disclosed, or represents that its use would not infringe
-privately owned rights.
+This computer code material was prepared, in part, as an account of
+work sponsored by an agency of the United States Government.  Neither
+the United States, nor the University of Chicago, nor any of their
+employees, makes any warranty express or implied, or assumes any legal
+liability or responsibility for the accuracy, completeness, or
+usefulness of any information, apparatus, product, or process
+disclosed, or represents that its use would not infringe privately
+owned rights.
 
diff --git a/doc/appendix/contributors.txt b/doc/appendix/contributors.txt
deleted file mode 100644
index ebc49d364..000000000
--- a/doc/appendix/contributors.txt
+++ /dev/null
@@ -1,76 +0,0 @@
-.. -*- mode: rst -*-
-
-.. _AUTHORS: http://trac.mcs.anl.gov/projects/bcfg2/browser/AUTHORS
-.. _MCS: http://www.mcs.anl.gov/
-
-.. _appendix-contributors:
-
-============
-Contributors
-============
-
-..
-   This is list is no longer in chronological order like the
-   AUTHORS file because it's easier to maintain (for me).
-   Automatically sorted.
-
-In alphabetical order of the given name:
-
-- Andrew Brestick <brestick@mcs.anl.gov> fixed bugs and completed 
-  plugins.
-- Brian Pellin and Andrew Lusk did substantial work on Bcfg1, some of 
-  which was used in the Bcfg2 client.
-- Chris Vuletich <vuletich@mcs.anl.gov> wrote some SSL code and the
-  verification debugging code.
-- Cory Lueninghoener <cory@mcs.anl.gov> wrote the showentries function
-  in ``bcfg2-info``.
-- Daniel Clark <dclark@pobox.com> created encap packages for bcfg2 and 
-  deps, wrote fossil-scm dvcs support, and helps with Debian packaging.
-- Danny Clark enabled the Encap packaging.
-- David Dahl worked on Hostbase.
-- David Strauss worked on CentOS, RHEL, Yum, and Bazaar VCS support.
-- Ed Smith <esmith4@inf.ed.ac.uk> has done substantial hardening of the
-  Bcfg client and server and implemented a common logging infrastructure.
-- Fabian Affolter <fabian@bernewireless.net> made some patches, added  
-  some new features and plugins, and restructured the manual for Bcfg2.
-- Jack Neely <jjneely@ncsu.edu> worked on YUMng.
-- James Yang <jjyang@mcs.anl.gov> worked on ``bcfg2-admin`` and 
-  ``bcfg2-reports``.
-- Jason Pepas <cell@ices.utexas.edu> has written a RPM package list creator
-  has contributed patches to the Red Hat toolset.
-- Joey Hagedorn <hagedorn@mcs.anl.gov> has written the reporting subsystem,
-  including StatReports, GenerateHostinfo, and the xslt, css and javascript
-  associated with it.
-- Jos Catnook fixed bugs.
-- Ken Raffenetti <raffenet@mcs.anl.gov> and Rick Bradshaw have written the
-  Hostbase plugin.
-- Michael Jinks <mjinks@uchicago.edu> wrote the Gentoo tool drivers.
-- Narayan Desai <desai@mcs.anl.gov> has written most of bcfg2, including all
-  parts not explicitly mentioned in this file.
-- Patrick Ruckstuhl fixed bugs in the templating.
-- Pedro Flores made the Reporting system design help.
-- Raul Cuza <raulcuza@gmail.com> updated the documentation.
-- Rick Bradshaw <bradshaw@mcs.anl.gov> has written several of the tools
-  included in the ``tools/`` subdirectory.
-- Robert Gogolok <gogo@cs.uni-sb.de> fixed bugs and made the code more
-  robust.
-- Sami Haahtinen <ressu@ressukka.net> has written Debian packaging logic.
-- Scott Behrens <behrens@mcs.anl.gov> and Rick Bradshaw have written the
-  VHost plugin.
-- Scott Matott
-- Sol Jerome <sol.jerome@gmail.com> squashes bugs, helps manage the
-  project roadmap, and implements various interesting features.
-- Ti Leggett worked on ebuild packaging and bugfixes, RPM packaging.
-- Tim Laszlo <tim.laszlo@gmail.com> worked on the reporting system and made
-  plugins.
-- Zach Lowry Solaris support and general hardening.
-
-
-The entire MCS_ systems team has provided invaluable help in the
-design process and refinement of the user interface. In particular,
-Gene Rackow and Sandra Bittner have provided great assistance
-throughout this project. Philip Steinbachs provided detailed
-feedback as an early external user.
-
-The most updated listing is available in the AUTHORS_ file in the
-git :term:`repository` for Bcfg2.
diff --git a/doc/appendix/index.txt b/doc/appendix/index.txt
index 407119e24..135d00bc8 100644
--- a/doc/appendix/index.txt
+++ b/doc/appendix/index.txt
@@ -11,7 +11,6 @@ Appendix
 
    files
    configuration
-   contributors
    books
    papers
    articles
diff --git a/redhat/bcfg2.spec.in b/redhat/bcfg2.spec.in
index 1b8ab5285..79dcd9173 100644
--- a/redhat/bcfg2.spec.in
+++ b/redhat/bcfg2.spec.in
@@ -193,7 +193,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS examples COPYRIGHT README
+%doc examples LICENSE COPYRIGHT README
 
 %ghost %attr(600,root,root) %config(noreplace) %{_sysconfdir}/bcfg2.conf