diff --git a/ChangeLog b/ChangeLog
index 3c713f244dd9d5548309c865e9ba9c216d205713..a1a7ee72de3946ff7baf3743d8e5f1ce5345a181 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,30 @@
 2002-08-17  Per Cederqvist  <ceder@ceder.dyndns.org>
 
+	Flag automatically generated files.
+	* src/server/testsuite/lyskomd.0/gen-15.py: Insert a warning in
+	the output that the result is automatically generated.
+	* src/server/testsuite/lyskomd.0/gen-19.py: Ditto.
+	* src/server/Makefile.am (aux.h): Se the mode of this generated
+	file to 444, to avoid accidental edits.
+
+	Portability fix.
+	* configure.in: Use "test x && test y" instead of "test x -a y",
+	since the -a option is less portable than the "&&" construct.
+
+	Update copyright headers.
+	* <all files>: update the year in the copyright notice.
+	* scripts/lyskomd-copyrights: Updated the list of files to ignore.
+	* src/server/testsuite/renumber.el: Copyright header added.
+
+	Xenofarm integration.
+	* scripts/xenofarm.sh: New file.  This version was taken from
+	revision 1.9 of projects/lyskom-server/source-transform.sh in the
+	xenofarm CVS module, and a copyright header and some initial
+	comments were added.
+	* scripts/Makefile.am (EXTRA_DIST): Added xenofarm.sh.
+	* Makefile.am (ident-cc): New target.
+	* doc/Makefile.am (ident-makeinfo): New target.
+
 	Release administrativa.
 	* HACKING: Mention gpg, the paths of the FTP an WWW servers, a few
 	web pages, and Freshmeat.