diff --git a/AUTHORS b/AUTHORS
index 13a43eecd..2635c0af9 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,60 +8,63 @@ releasing patches to the original code through the Internet.
 The following people have contributed in some way:
 
 @verbatim
-Vera Albrecht <albrecht@danalyse.de>,
-Cecil Aswell <aswell@netcom.com>,
+Vera Albrecht,
+Cecil Aswell,
 Giles C. Billingsley,
-Phil Barker <philb@intrinsity.com>,
-Steven Borley <steven.borley@virgin.net>,
-Stuart Brorson <sdb@cloud9.net>,
+Phil Barker,
+Steven Borley,
+Stuart Brorson,
 Mansun Chan,
 Wayne A. Christopher,
-Al Davis <aldavis@ieee.org>,
-Glao S. Dezai <dezai@hotbot.com>,
-Jon Engelbert <jon@beigebag.com>,
-Daniele Foci <d.foci@ieee.ing.uniroma1.it>,
-Noah Friedman <friedman@prep.ai.mit.edu>,
+Al Davis,
+Glao S. Dezai,
+Jon Engelbert,
+Daniele Foci,
+Noah Friedman,
 David A. Gates,
-Alan Gillespie <Alan.Gillespie@analog.com>,
-John Heidemann <johnh@isi.edu>,
+Alan Gillespie,
+John Heidemann,
 Jeffrey M. Hsu,
 JianHui Huang,
 S. Hwang,
-Chris Inbody <cinbody@cowtown.net>,
+Chris Inbody,
 Gordon M. Jacobs,
 Min-Chie Jeng,
-Beorn Johnson <beorn@eecs.berkeley.edu>,
-Stefan Jones <stefan.jones@multigig.com>,
+Beorn Johnson,
+Stefan Jones,
 Kenneth H. Keller,
+Robert Larice,
 Mathew Lew,
-Robert Lindsell <robertl@research.canon.com.au>,
+Robert Lindsell,
 Weidong Liu,
 Kartikeya Mayaram,
-Richard D. McRoberts <rdm@csn.net>,
-Manfred Metzger <ManfredMetzger@gmx.de>,
+Richard D. McRoberts,
+Manfred Metzger,
 Wolfgang Muees,
-Paolo Nenzi <pnenzi@ieee.org>,
+Paolo Nenzi,
 Gary W. Ng,
 Hong June Park,
-Arno Peters <A.W.Peters@ieee.org>,
-Serban-Mihai Popescu <serbanp@ix.netcom.com>,
-Georg Post <georg.post@wanadoo.fr>
+Arno Peters,
+Serban-Mihai Popescu,
+Georg Post,
 Thomas L. Quarles,
-Emmanuel Rouat <emmanuel.rouat@wanadoo.fr>,
-Jean-Marc Routure <routoure@greyc.ismra.fr>,
+Emmanuel Rouat,
+Jean-Marc Routure,
 Jaijeet S. Roychowdhury,
+Lionel Sainte Cluque,
 Takayasu Sakurai,
-AMAKAWA Shuhei <sa264@cam.ac.uk>,
+AMAKAWA Shuhei,
 Kanwar Jit Singh,
-Hitoshi Tanaka <HDA01055@nifty.com>,
-Steve Tell <tell@cs.unc.edu>
-Andrew Tuckey <Tuckey@ieee.org>,
-Andreas Unger <a_unger@gmx.de>,
-Holger Vogt <holger.vogt@uni-duisburg.de>,
+Bill Swartz,
+Hitoshi Tanaka,
+Steve Tell,
+Andrew Tuckey,
+Andreas Unger,
+Holger Vogt,
 Dietmar Warning,
-Michael Widlok <widlok@uci.agh.edu.pl>,
-Charles D.H. Williams <C.D.H.Williams@exeter.ac.uk>,
-Antony Wilson <wilsona@earthlink.net>,
+Michael Widlok,
+Charles D.H. Williams,
+Antony Wilson,
 and many others...
 @end verbatim
 
diff --git a/COPYING b/COPYING
index c6db39de2..ca2639a10 100644
--- a/COPYING
+++ b/COPYING
@@ -1,6 +1,6 @@
 12345678901234567890123456789012345678901234567890123456789012345678901234567890
-Ngspice rework-18
-Copyright (c) 2008, 
+Ngspice-21
+Copyright (c) 2010, 
 All rights reserved.
 
 
diff --git a/ChangeLog b/ChangeLog
index 4e3b49e4c..981a24866 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2010-06-20 Holger Vogt
+ * AUTHORS, INSTALL, COPYING, README: update to version 21
+
 2010-06-19 Holger Vogt
  * inpdomod.c: refernces to not existing MOS levels 60, 61 deleted.
  
diff --git a/INSTALL b/INSTALL
index da59738f0..263a0d3a0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -74,8 +74,13 @@ This file describes the procedures to install ngspice from sources.
 	
  See the section titled 'Advanced Install' for instructions about arguments 
  that can be passed to ./configure to customise the build and installation.
+  
+ Preferred arguments to ./configure to obtain a comfortably working ngspice may be
+ --with-editline=yes (if not available, --with-readline=yes will work, but has
+ a licensing issue) and --disable-debug (for smaller and speed optimized
+ executable). 
 
-     If a problem is found with the build proccess, please submit a report to 
+ If a problem is found with the build proccess, please submit a report to 
  the Ngspice development team. Please provide information about your system 
  and any ./configure arguments you are using, together with any error 
  messages.  Ideally you would have tried to fix the problem yourself first.
@@ -103,6 +108,11 @@ This file describes the procedures to install ngspice from sources.
 
  See the section titled 'Advanced Install' for instructions about arguments 
  that can be passed to ./configure to customise the build and installation.
+ 
+ Preferred arguments to ./configure to obtain a comfortably working ngspice may be
+ --with-editline=yes (if not available, --with-readline=yes will work, but has
+ a licensing issue) and --disable-debug (for smaller and speed optimized
+ executable). 
 
 
 1.4 Advanced Install
diff --git a/README b/README
index 8f7f7d356..f9e06a4ce 100644
--- a/README
+++ b/README
@@ -55,7 +55,7 @@ WEB SITEs:
 
 This project is hosted on Sourceforge.net. 
 The home page is http://ngspice.sourceforge.net
-The summary page is http://sf.net/projects/ngspice
+The summary page is http://sourceforge.net/projects/ngspice
 The ngspice page on gEDA site is http://geda.seul.org/tools/ngspice/index.html