diff --git a/ChangeLog b/ChangeLog
index 7cb2d05c15adac964075f3a8d78986933966a6bb..9a3b66b485c0982fa732a7ae26f54b27e6635f94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,35 @@
 2003-08-23  Per Cederqvist  <ceder@ceder.dyndns.org>
 
+	"make distcheck" lint.
+	* src/server/testsuite/lyskomd.0/Makefile.am (MOSTLYCLEANFILES):
+	Added aux-items-35.conf and aux-items-46.conf.
+	* doc/Makefile.am (MOSTLYCLEANFILES): Added Protocol-A.dvi.
+	* src/server/testsuite/lyskomd.0/35.exp: Store the temporary
+	aux-item file in lyskomd.0/aux-items-35.conf, instead of
+	35-aux.conf, just like other test files already do.
+	* src/server/testsuite/.cvsignore: Don't ignore 35-aux.conf.
+	* src/server/testsuite/lyskomd.0/.cvsignore: Ignore aux-items-35.conf.
+	* src/server/testsuite/lyskomd.0/46.exp: Remove the temporary file
+	before copying files to it, to avoid permission problems if the
+	files in the source tree has read-only permissions.
+
+	Updated the copyright-updating scripts.
+	* scripts/update-copyright: Updated copyright heading.
+	* scripts/lyskomd-copyrights: Updated copyright heading.  Don't
+	update copyright headers of adns or liboop.
+
+	Update version numbers.
+	* HACKING: Updated where version numbers are found.
+	* configure.in: Set version 2.1.0.
+	* versions (PROTOCOL-A-LEVEL): 11.
+	(SERVER-VERSION): 2.1.0.
+	(SERVER-COMPAT-VERSION): 20100.
+	* doc/Protocol-A.texi (PROTOEDITION): Set to 11.0.
+	(PROTOVER): Set to 11.
+	(VERSION): Set to 2.1.0.
+	(Client-Server Dialog): Talk about "version 10 or newer", not
+	only "version 10".
+
 	Release administrativa.
 	* NEWS: Updated for the 2.1.0 release.
 	* HACKING: Mention that our automake patch is obsolete.