diff --git a/ChangeLog b/ChangeLog
index 0a441f5a4d90aa94205a3c5f4c11165ebd1c4627..e7872bd2fa7c3934c9499b62c83eff832ca18337 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,41 @@
 2003-08-12  Per Cederqvist  <ceder@ceder.dyndns.org>
 
+	lyskomd is now officially shut down via SIGTERM.  (SIGHUP still
+	works, and SIGINT also shuts it down.)  (Bug 808).
+	* doc/lyskomd.texi (Parameters): lyskomd is now officially shut
+	down by SIGTERM, not SIGHUP.
+	(Signals): Ditto.  However, SIGHUP and SIGINT also works.
+	(Administration): Recommend SIGTERM, not SIGHUP.
+	(Bugs): Removed entry about terminating on SIGINT and SIGTERM.
+	* src/server/testsuite/config/unix.exp (lyskomd_death): The reason
+	"signal" now means SIGTERM.  Also handle "sighup" and "sigint".
+	* src/server/updateLysKOM.c (checkstatus): Use SIGTERM, not
+	SIGHUP.
+	* src/server/sigflags.h: Updated a comment: SIGTERM is now the
+	official way to shut down lyskomd.
+	* src/server/ramkomd.c (server_init): Handle SIGTERM and SIGINT
+	the same way as SIGHUP: shut down.
+	(main): Ditto.
+	(sighandler_term): New name for former sighandler_hup.  Log proper
+	message depending on which signal was used to shut down the
+	server.
+	* src/server/komrunning.c (shutdown_lyskom): Use SIGTERM, not
+	SIGHUP, to shut down lyskomd.
+	* src/server/connections.c: Updated a comment: SIGTERM is now the
+	official way to shut down lyskomd.
+	* src/server/testsuite/lyskomd.0/31.exp: Test to shut down the
+	server by both SIGTERM, SIGHUP and SIGINT.
+	* src/server/testsuite/lyskomd.0/07.exp: Use TERM instead of HUP
+	to shut down lyskomd.
+	* src/server/testsuite/lyskomd.0/11.exp: 
+	* src/server/testsuite/lyskomd.0/30.exp: 
+	* src/server/testsuite/lyskomd.0/37.exp: 
+	* src/server/testsuite/lyskomd.0/38.exp: 
+	* src/server/testsuite/lyskomd.0/39.exp: 
+	* src/server/testsuite/lyskomd.0/bug-48.exp: 
+	* src/server/testsuite/lyskomd.0/bug-52.exp: 
+	* src/server/testsuite/lyskomd.0/bug-810.exp: 
+
 	The same text can no longer be FAQ for the same conference twice.
 	(Bug 572).
 	* run-support/aux-items.conf (faq-conf): Added unique-data, so