Further clarification of the CIDER license status,

table.cm status added.

COPYING

@@ -55,11 +55,12 @@ license. (http://embedded.eecs.berkeley.edu/pubs/downloads/spice/index.htm)
 On 2008, December 1st, tclspice changes license from GPL to LGPLv2, in
 accordance with Multigig Ltd, the copyright holder.
 
-The CIDER license (see below) does not contain the controversial advertisement
-clause and thus is compatible to the new BSD license.
+The original CIDER license (see below) does not contain the controversial
+advertisement clause and thus is compatible to the new BSD license. In addition
+this clause has been removed from all BSD licensed software originating from UCB
+(see statement below).
 
-The following table is just a reminder on license status, please don't rely
-on it:
+The following table is a summary of license status:
           Author            License  Notes
 
 numparam  Georg Post        LGPL     Applies to the code in
@@ -70,8 +71,42 @@ tclspice  Stefan Jones      LGPL     TCL integration
 cider     U. of California  New BSD  Device level simulator
 xspice    Georgia Tech.     Public D Mixed signals
 spice     U. of California  New BSD  Analog circuit simulation
+table.cm  Holger Vogt       GPL      Code model shared library
+                                     containing GPLed code.
 
 
+--------------------------------- New BSD -----------------------------------
+
+All `old' BSD licenses (of SPICE or CIDER) have been changed to the `modified'
+BSD license according to the following publication
+see [ftp://ftp.cs.berkeley.edu/pub/4bsd/README.Impt.License.Change]):
+
+July 22, 1999
+
+To All Licensees, Distributors of Any Version of BSD:
+
+As you know, certain of the Berkeley Software Distribution (`BSD') source code
+files require that further distributions of products containing all or
+portions of the software, acknowledge within their advertising materials
+that such products contain software developed by UC Berkeley and its contributors.
+
+Specifically, the provision reads:
+
+`3. All advertising materials mentioning features or use of this software must
+display the following acknowledgment: This product includes software developed
+by the University of California, Berkeley and its contributors.'
+
+Effective immediately, licensees and distributors are no longer required to
+include the acknowledgment within advertising materials. Accordingly, the
+foregoing paragraph of those BSD Unix files containing it is hereby deleted
+in its entirety.
+
+William Hoskins
+
+Director, Office of Technology Licensing
+
+University of California, Berkeley
+
 ---------------------------------- Cider -----------------------------------
 
                     RESEARCH SOFTWARE AGREEMENT